[Digikam-devel] extragear/graphics/digikam/libs
Gilles Caulier
caulier.gilles at free.fr
Wed Nov 8 12:00:48 GMT 2006
SVN commit 603259 by cgilles:
digikam from trunk : all implementations in digiKam core libs use DWarning() & DError() class instead kdWarning() && kdError(). See B.K.O file 133026 for details
CCBUGS: 133026
CCMAIL: digikam-devel at kde.org
M +1 -1 curves/imagecurves.cpp
M +3 -3 dimg/dimg.cpp
M +1 -1 dimg/filters/dimggaussianblur.cpp
M +10 -10 dimg/filters/dimgimagefilters.cpp
M +5 -5 dimg/filters/dimgsharpen.cpp
M +3 -3 dimg/loaders/rawloader.cpp
M +3 -3 dimg/loaders/tiffloader.cpp
M +1 -1 histogram/imagehistogram.cpp
M +3 -3 imageproperties/imagedescedittab.cpp
M +2 -2 jpegutils/jpegutils.cpp
M +3 -3 levels/imagelevels.cpp
M +1 -1 thumbbar/thumbnailjob.cpp
M +1 -1 widgets/imageplugins/imageregionwidget.cpp
--- trunk/extragear/graphics/digikam/libs/curves/imagecurves.cpp #603258:603259
@@ -638,7 +638,7 @@
fields = fscanf (file, "%d %d ", &index[i][j], &value[i][j]);
if (fields != 2)
{
- kdWarning() << "Invalid Gimp curves file!" << endl;
+ DWarning() << "Invalid Gimp curves file!" << endl;
fclose(file);
return false;
}
--- trunk/extragear/graphics/digikam/libs/dimg/dimg.cpp #603258:603259
@@ -797,7 +797,7 @@
if (src->sixteenBit() != sixteenBit())
{
- kdWarning() << "Blitting from 8-bit to 16-bit or vice versa is not supported" << endl;
+ DWarning() << "Blitting from 8-bit to 16-bit or vice versa is not supported" << endl;
return;
}
@@ -819,7 +819,7 @@
if (bytesDepth() != sdepth)
{
- kdWarning() << "Blitting from 8-bit to 16-bit or vice versa is not supported" << endl;
+ DWarning() << "Blitting from 8-bit to 16-bit or vice versa is not supported" << endl;
return;
}
@@ -933,7 +933,7 @@
if (src->sixteenBit() != sixteenBit())
{
- kdWarning() << "Blending from 8-bit to 16-bit or vice versa is not supported" << endl;
+ DWarning() << "Blending from 8-bit to 16-bit or vice versa is not supported" << endl;
return;
}
--- trunk/extragear/graphics/digikam/libs/dimg/filters/dimggaussianblur.cpp #603258:603259
@@ -66,7 +66,7 @@
{
if (!data || !width || !height)
{
- kdWarning() << ("DImgGaussianBlur::gaussianBlurImage: no image data available!")
+ DWarning() << ("DImgGaussianBlur::gaussianBlurImage: no image data available!")
<< endl;
return;
}
--- trunk/extragear/graphics/digikam/libs/dimg/filters/dimgimagefilters.cpp #603258:603259
@@ -58,7 +58,7 @@
{
if (!data || !w || !h)
{
- kdWarning() << ("DImgImageFilters::equalizeImage: no image data available!") << endl;
+ DWarning() << ("DImgImageFilters::equalizeImage: no image data available!") << endl;
return;
}
@@ -85,7 +85,7 @@
if(equalize_map)
delete [] equalize_map;
- kdWarning() << ("DImgImageFilters::equalizeImage: Unable to allocate memory!") << endl;
+ DWarning() << ("DImgImageFilters::equalizeImage: Unable to allocate memory!") << endl;
return;
}
@@ -207,7 +207,7 @@
{
if (!data || !w || !h)
{
- kdWarning() << ("DImgImageFilters::stretchContrastImage: no image data available!") << endl;
+ DWarning() << ("DImgImageFilters::stretchContrastImage: no image data available!") << endl;
return;
}
@@ -231,7 +231,7 @@
if(normalize_map)
delete [] normalize_map;
- kdWarning() << ("DImgImageFilters::stretchContrastImage: Unable to allocate memory!") << endl;
+ DWarning() << ("DImgImageFilters::stretchContrastImage: Unable to allocate memory!") << endl;
return;
}
@@ -624,7 +624,7 @@
{
if (!data || !w || !h)
{
- kdWarning() << ("DImgImageFilters::autoLevelsCorrectionImage: no image data available!")
+ DWarning() << ("DImgImageFilters::autoLevelsCorrectionImage: no image data available!")
<< endl;
return;
}
@@ -667,7 +667,7 @@
{
if (!data || !w || !h)
{
- kdWarning() << ("DImgImageFilters::invertImage: no image data available!")
+ DWarning() << ("DImgImageFilters::invertImage: no image data available!")
<< endl;
return;
}
@@ -710,7 +710,7 @@
{
if (!data || !Width || !Height)
{
- kdWarning() << ("DImgImageFilters::channelMixerImage: no image data available!")
+ DWarning() << ("DImgImageFilters::channelMixerImage: no image data available!")
<< endl;
return;
}
@@ -785,7 +785,7 @@
{
if (!data || !width || !height)
{
- kdWarning() << ("DImgImageFilters::changeTonality: no image data available!")
+ DWarning() << ("DImgImageFilters::changeTonality: no image data available!")
<< endl;
return;
}
@@ -839,7 +839,7 @@
{
if (!data || !width || !height)
{
- kdWarning() << ("DImgImageFilters::gaussianBlurImage: no image data available!")
+ DWarning() << ("DImgImageFilters::gaussianBlurImage: no image data available!")
<< endl;
return;
}
@@ -860,7 +860,7 @@
{
if (!data || !width || !height)
{
- kdWarning() << ("DImgImageFilters::sharpenImage: no image data available!")
+ DWarning() << ("DImgImageFilters::sharpenImage: no image data available!")
<< endl;
return;
}
--- trunk/extragear/graphics/digikam/libs/dimg/filters/dimgsharpen.cpp #603258:603259
@@ -75,7 +75,7 @@
{
if (m_orgImage.isNull())
{
- kdWarning() << k_funcinfo << "No image data available!"
+ DWarning() << k_funcinfo << "No image data available!"
<< endl;
return;
}
@@ -93,7 +93,7 @@
if((int)m_orgImage.width() < kernelWidth)
{
- kdWarning() << k_funcinfo << "Image is smaller than radius!"
+ DWarning() << k_funcinfo << "Image is smaller than radius!"
<< endl;
return;
}
@@ -102,7 +102,7 @@
if(!kernel)
{
- kdWarning() << k_funcinfo << "Unable to allocate memory!"
+ DWarning() << k_funcinfo << "Unable to allocate memory!"
<< endl;
return;
}
@@ -137,7 +137,7 @@
if((kernelWidth % 2) == 0)
{
- kdWarning() << k_funcinfo << "Kernel width must be an odd number!"
+ DWarning() << k_funcinfo << "Kernel width must be an odd number!"
<< endl;
return(false);
}
@@ -146,7 +146,7 @@
if(!normal_kernel)
{
- kdWarning() << k_funcinfo << "Unable to allocate memory!"
+ DWarning() << k_funcinfo << "Unable to allocate memory!"
<< endl;
return(false);
}
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/rawloader.cpp #603258:603259
@@ -362,7 +362,7 @@
// actually start the process
if ( !m_process->start(KProcess::NotifyOnExit, KProcess::Communication(KProcess::Stdout | KProcess::Stderr)) )
{
- kdError() << "Failed to start dcraw" << endl;
+ DError() << "Failed to start dcraw" << endl;
delete m_process;
m_process = 0;
m_running = false;
@@ -413,7 +413,7 @@
QString magic = QString::fromAscii(buffer, 2);
if (magic != "P6")
{
- kdError() << "Cannot parse header from dcraw: Magic is " << magic << endl;
+ DError() << "Cannot parse header from dcraw: Magic is " << magic << endl;
m_process->kill();
return;
}
@@ -437,7 +437,7 @@
QStringList sizes = QStringList::split(" ", splitlist[1]);
if (splitlist.size() < 3 || sizes.size() < 2)
{
- kdError() << "Cannot parse header from dcraw: Could not split" << endl;
+ DError() << "Cannot parse header from dcraw: Could not split" << endl;
m_process->kill();
return;
}
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/tiffloader.cpp #603258:603259
@@ -141,7 +141,7 @@
if (TIFFGetField(tif, TIFFTAG_ROWSPERSTRIP, &rows_per_strip) == 0 || rows_per_strip == 0)
{
- kdWarning() << "TIFF loader: Cannot handle non-stripped images. Loading file " << filePath << endl;
+ DWarning() << "TIFF loader: Cannot handle non-stripped images. Loading file " << filePath << endl;
TIFFClose(tif);
return false;
}
@@ -150,7 +150,7 @@
samples_per_pixel == 0 ||
rows_per_strip == 0)
{
- kdWarning() << "TIFF loader: Encountered invalid value 0 in image."
+ DWarning() << "TIFF loader: Encountered invalid value 0 in image."
<< " bits_per_sample " << bits_per_sample
<< " samples_per_pixel " << samples_per_pixel
<< " rows_per_strip " << rows_per_strip
@@ -168,7 +168,7 @@
if (photometric != PHOTOMETRIC_RGB &&
photometric != PHOTOMETRIC_MINISBLACK)
{
- kdWarning() << "Can't handle image without RGB color-space: "
+ DWarning() << "Can't handle image without RGB color-space: "
<< photometric << endl;
TIFFClose(tif);
return false;
--- trunk/extragear/graphics/digikam/libs/histogram/imagehistogram.cpp #603258:603259
@@ -175,7 +175,7 @@
if ( !d->histogram )
{
- kdWarning() << ("HistogramWidget::calcHistogramValues: Unable to allocate memory!") << endl;
+ DWarning() << ("HistogramWidget::calcHistogramValues: Unable to allocate memory!") << endl;
if (d->parent)
postProgress(false, false);
--- trunk/extragear/graphics/digikam/libs/imageproperties/imagedescedittab.cpp #603258:603259
@@ -490,7 +490,7 @@
PAlbum *album = d->currInfo->album();
if (!album)
{
- kdWarning() << k_funcinfo << "Failed to find parent album for"
+ DWarning() << k_funcinfo << "Failed to find parent album for"
<< fileURL << endl;
return;
}
@@ -763,7 +763,7 @@
if (!parentItem)
{
- kdWarning() << k_funcinfo << "Failed to find parent for Tag " << tag->title()
+ DWarning() << k_funcinfo << "Failed to find parent for Tag " << tag->title()
<< endl;
return;
}
@@ -814,7 +814,7 @@
QCheckListItem* viewItem = (QCheckListItem*)(album->extraData(this));
if (!viewItem)
{
- kdWarning() << "Failed to find view item for Tag "
+ DWarning() << "Failed to find view item for Tag "
<< album->title() << endl;
return;
}
--- trunk/extragear/graphics/digikam/libs/jpegutils/jpegutils.cpp #603258:603259
@@ -160,7 +160,7 @@
input_file = fopen(in, "rb");
if (!input_file)
{
- kdWarning() << "ExifRotate: Error in opening input file: " << input_file << endl;
+ DWarning() << "ExifRotate: Error in opening input file: " << input_file << endl;
return false;
}
@@ -168,7 +168,7 @@
if (!output_file)
{
fclose(input_file);
- kdWarning() << "ExifRotate: Error in opening output file: " << output_file << endl;
+ DWarning() << "ExifRotate: Error in opening output file: " << output_file << endl;
return false;
}
--- trunk/extragear/graphics/digikam/libs/levels/imagelevels.cpp #603258:603259
@@ -603,14 +603,14 @@
if (fields != 4)
{
- kdWarning() << "Invalid Gimp levels file!" << endl;
+ DWarning() << "Invalid Gimp levels file!" << endl;
fclose(file);
return false;
}
if (!fgets (buf, 50, file))
{
- kdWarning() << "Invalid Gimp levels file!" << endl;
+ DWarning() << "Invalid Gimp levels file!" << endl;
fclose(file);
return false;
}
@@ -619,7 +619,7 @@
if (buf == nptr || errno == ERANGE)
{
- kdWarning() << "Invalid Gimp levels file!" << endl;
+ DWarning() << "Invalid Gimp levels file!" << endl;
fclose(file);
return false;
}
--- trunk/extragear/graphics/digikam/libs/thumbbar/thumbnailjob.cpp #603258:603259
@@ -277,7 +277,7 @@
if (thumb.isNull())
{
- kdWarning() << k_funcinfo << "thumbnail is null" << endl;
+ DWarning() << k_funcinfo << "thumbnail is null" << endl;
emit signalFailed(d->curr_url);
return;
}
--- trunk/extragear/graphics/digikam/libs/widgets/imageplugins/imageregionwidget.cpp #603258:603259
@@ -205,7 +205,7 @@
break;
}
default:
- kdWarning() << "Unknown separation view specified"
+ DWarning() << "Unknown separation view specified"
<< endl;
}
More information about the Digikam-devel
mailing list