Differential D24367 Diff 67201 src/imageformats/pcx.cpp

Changeset View

Standalone View

View Options

src/imageformats/pcx.cpp

Context not available.
253 img = QImage(header.width(), header.height(), QImage::Format_Mono); 253​ img = QImage(header.width(), header.height(), QImage::Format_Mono);
254 img.setColorCount(2); 254​ img.setColorCount(2);
255 255​
256 if (img.isNull()) 256​ if (img.isNull()) {
257​ qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
257 return; 258​ return;
259​ }
258 260​
259 for (int y = 0; y < header.height(); ++y) { 261​ for (int y = 0; y < header.height(); ++y) {
260 if (s.atEnd()) { 262​ if (s.atEnd()) {
Context not available.
282 284​
283 img = QImage(header.width(), header.height(), QImage::Format_Indexed8); 285​ img = QImage(header.width(), header.height(), QImage::Format_Indexed8);
284 img.setColorCount(16); 286​ img.setColorCount(16);
287​ if (img.isNull()) {
288​ qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
289​ return;
290​ }
285 291​
286 for (int y = 0; y < header.height(); ++y) { 292​ for (int y = 0; y < header.height(); ++y) {
287 if (s.atEnd()) { 293​ if (s.atEnd()) {
Context not available.
301 } 307​ }
302 308​
303 uchar *p = img.scanLine(y); 309​ uchar *p = img.scanLine(y);
310​ if (!p) {
311​ qWarning() << "Failed to get scanline for" << y << "might be out of bounds";
312​ }
cfeckUnsubmitted
Done

If p indeed could be zero, the next statements need to be in an else block (or a add a return).

cfeck: If `p` indeed could be zero, the next statements need to be in an `else` block (or a add a…
sandsmarkAuthorUnsubmitted
Done

good catch, thanks

sandsmark: good catch, thanks
304 for (int x = 0; x < header.width(); ++x) { 313​ for (int x = 0; x < header.width(); ++x) {
305 p[ x ] = pixbuf[ x ]; 314​ p[ x ] = pixbuf[ x ];
306 } 315​ }
Context not available.
319 img = QImage(header.width(), header.height(), QImage::Format_Indexed8); 328​ img = QImage(header.width(), header.height(), QImage::Format_Indexed8);
320 img.setColorCount(256); 329​ img.setColorCount(256);
321 330​
331​ if (img.isNull()) {
332​ qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
333​ return;
334​ }
335​
322 for (int y = 0; y < header.height(); ++y) { 336​ for (int y = 0; y < header.height(); ++y) {
323 if (s.atEnd()) { 337​ if (s.atEnd()) {
324 img = QImage(); 338​ img = QImage();
Context not available.
360 374​
361 img = QImage(header.width(), header.height(), QImage::Format_RGB32); 375​ img = QImage(header.width(), header.height(), QImage::Format_RGB32);
362 376​
377​ if (img.isNull()) {
378​ qWarning() << "Failed to allocate image, invalid dimensions?" << QSize(header.width(), header.height());
379​ return;
380​ }
381​
363 for (int y = 0; y < header.height(); ++y) { 382​ for (int y = 0; y < header.height(); ++y) {
364 if (s.atEnd()) { 383​ if (s.atEnd()) {
365 img = QImage(); 384​ img = QImage();
Context not available.