Mercurial > hg > svgui
comparison layer/SingleColourLayer.cpp @ 682:1a0dfcbffaf1
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 14:06:40 +0000 |
parents | 4806715f7a19 |
children | e93c6ae12526 |
comparison
equal
deleted
inserted
replaced
681:eaf4446a1bef | 682:1a0dfcbffaf1 |
---|---|
159 // We don't want to call this if !v because that probably | 159 // We don't want to call this if !v because that probably |
160 // means we're being called from the constructor, and this is | 160 // means we're being called from the constructor, and this is |
161 // a virtual function | 161 // a virtual function |
162 hint = getDefaultColourHint(dark, impose); | 162 hint = getDefaultColourHint(dark, impose); |
163 #ifdef DEBUG_COLOUR_SELECTION | 163 #ifdef DEBUG_COLOUR_SELECTION |
164 std::cerr << "hint = " << hint << ", impose = " << impose << std::endl; | 164 cerr << "hint = " << hint << ", impose = " << impose << endl; |
165 #endif | 165 #endif |
166 } else { | 166 } else { |
167 #ifdef DEBUG_COLOUR_SELECTION | 167 #ifdef DEBUG_COLOUR_SELECTION |
168 std::cerr << "(from ctor)" << std::endl; | 168 cerr << "(from ctor)" << endl; |
169 #endif | 169 #endif |
170 } | 170 } |
171 | 171 |
172 if (hint >= 0 && impose) { | 172 if (hint >= 0 && impose) { |
173 setBaseColour(hint); | 173 setBaseColour(hint); |
186 if (m_colourRefCount.find(index) != m_colourRefCount.end()) { | 186 if (m_colourRefCount.find(index) != m_colourRefCount.end()) { |
187 count = m_colourRefCount[index]; | 187 count = m_colourRefCount[index]; |
188 } | 188 } |
189 | 189 |
190 #ifdef DEBUG_COLOUR_SELECTION | 190 #ifdef DEBUG_COLOUR_SELECTION |
191 std::cerr << "index = " << index << ", count = " << count; | 191 cerr << "index = " << index << ", count = " << count; |
192 #endif | 192 #endif |
193 | 193 |
194 if (bestColour < 0 || count < bestCount) { | 194 if (bestColour < 0 || count < bestCount) { |
195 bestColour = index; | 195 bestColour = index; |
196 bestCount = count; | 196 bestCount = count; |
197 #ifdef DEBUG_COLOUR_SELECTION | 197 #ifdef DEBUG_COLOUR_SELECTION |
198 std::cerr << " *"; | 198 cerr << " *"; |
199 #endif | 199 #endif |
200 } | 200 } |
201 | 201 |
202 #ifdef DEBUG_COLOUR_SELECTION | 202 #ifdef DEBUG_COLOUR_SELECTION |
203 std::cerr << std::endl; | 203 cerr << endl; |
204 #endif | 204 #endif |
205 } | 205 } |
206 | 206 |
207 if (bestColour < 0) m_colour = 0; | 207 if (bestColour < 0) m_colour = 0; |
208 else m_colour = bestColour; | 208 else m_colour = bestColour; |