[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/krita
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2008-08-21 12:54:53
Message-ID: 1219323293.477162.8854.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850402 by rempt:

Fix some krazy issues.


 M  +1 -1      gmagick/kis_image_magick_converter.cc  
 M  +9 -9      jpeg/kis_jpeg_converter.cc  
 M  +4 -4      libkisexiv2/kis_exif_io.cpp  
 M  +1 -1      pdf/kis_pdf_import.cpp  


--- trunk/koffice/filters/krita/gmagick/kis_image_magick_converter.cc #850401:850402
@@ -275,7 +275,7 @@
     void exportAnnotationsForImage(Image * dst, vKisAnnotationSP_it& it, \
vKisAnnotationSP_it& annotationsEnd)  {
         while(it != annotationsEnd) {
-            if (!(*it) || (*it) -> type() == QString()) {
+            if (!(*it) || (*it)->type().isEmpty() ) {
                     dbgFile <<"Warning: empty annotation";
                     ++it;
                     continue;
--- trunk/koffice/filters/krita/jpeg/kis_jpeg_converter.cc #850401:850402
@@ -269,12 +269,12 @@
 
     for (jpeg_saved_marker_ptr marker = cinfo.marker_list; marker != NULL; marker = \
marker->next) {  dbgFile <<"Marker is" << marker->marker;
-        if (  marker->marker != (JOCTET) (JPEG_APP0 + 1) 
+        if (  marker->marker != (JOCTET) (JPEG_APP0 + 1)
             || marker->data_length < 14)
         {
             continue; /* Exif data is in an APP1 marker of at least 14 octets */
         }
-        
+
         if (GETJOCTET (marker->data[0]) != (JOCTET) 0x45 ||
             GETJOCTET (marker->data[1]) != (JOCTET) 0x78 ||
             GETJOCTET (marker->data[2]) != (JOCTET) 0x69 ||
@@ -364,9 +364,9 @@
         }
         break;
     }
-    
+
     dbgFile <<"Looking for XMP information";
-    
+
     for (jpeg_saved_marker_ptr marker = cinfo.marker_list; marker != NULL; marker = \
marker->next) {  dbgFile <<"Marker is" << marker->marker;
         if (marker->marker != (JOCTET) (JPEG_APP0 + 1) || marker->data_length < 31)
@@ -385,7 +385,7 @@
         xmpIO->loadFrom( layer->metaData(), new QBuffer( &byteArray ) );
         break;
     }
-    
+
     // Dump loaded metadata
     layer->metaData()->debugDump();
 
@@ -488,7 +488,7 @@
 
     // Smoothing
     cinfo.smoothing_factor = options.smooth;
-    
+
     // Subsampling
     switch(options.subsampling)
     {
@@ -535,7 +535,7 @@
         }
             break;
     }
-    
+
     // Start compression
     jpeg_start_compress(&cinfo, true);
     // Save exif and iptc information if any available
@@ -587,7 +587,7 @@
     // Save annotation
     vKisAnnotationSP_it it = annotationsStart;
     while(it != annotationsEnd) {
-        if (!(*it) || (*it) -> type() == QString()) {
+        if (!(*it) || (*it)->type().isEmpty()) {
             dbgFile <<"Warning: empty annotation";
             ++it;
             continue;
@@ -609,7 +609,7 @@
 
     JSAMPROW row_pointer = new JSAMPLE[width*cinfo.input_components];
     int color_nb_bits = 8 * layer->paintDevice()->pixelSize() / \
                layer->paintDevice()->channelCount();
-    
+
     for (; cinfo.next_scanline < height;) {
         KisHLineConstIterator it = layer->paintDevice()->createHLineConstIterator(0, \
cinfo.next_scanline, width);  quint8 *dst = row_pointer;
--- trunk/koffice/filters/krita/libkisexiv2/kis_exif_io.cpp #850401:850402
@@ -140,7 +140,7 @@
     QMap<QString, KisMetaData::Value> oecfStructure = value.asStructure();
     quint16 columns = oecfStructure["Columns"].asVariant().toInt(0);
     quint16 rows = oecfStructure["Rows"].asVariant().toInt(0);
-    
+
     QList<KisMetaData::Value> names = oecfStructure["Names"].asArray();
     QList<KisMetaData::Value> values = oecfStructure["Values"].asArray();
     Q_ASSERT(columns*rows == values.size());
@@ -208,7 +208,7 @@
     QMap<QString, KisMetaData::Value> deviceSettingStructure = value.asStructure();
     quint16 columns = deviceSettingStructure["Columns"].asVariant().toInt(0);
     quint16 rows = deviceSettingStructure["Rows"].asVariant().toInt(0);
-    
+
     QList<KisMetaData::Value> settings = \
deviceSettingStructure["Settings"].asArray();  Q_ASSERT(columns*rows == \
settings.size());  QByteArray array(4,0);
@@ -230,7 +230,7 @@
 {
     uint16_t v = value->toLong();
     QMap<QString, KisMetaData::Value> flashStructure;
-    bool fired = ( v & 0x01); // bit 1 is wether flash was fired or not
+    bool fired = ( v & 0x01); // bit 1 is whether flash was fired or not
     flashStructure["Fired"] = QVariant(fired);
     int ret = ( (v >> 1) & 0x03); // bit 2 and 3 are Return
     flashStructure["Return"] = QVariant(ret);
@@ -370,7 +370,7 @@
             }
         }
     }
-    
+
     Exiv2::DataBuf rawData = exifData.copy();
     ioDevice->write( (const char*) rawData.pData_, rawData.size_);
     ioDevice->close();
--- trunk/koffice/filters/krita/pdf/kis_pdf_import.cpp #850401:850402
@@ -145,7 +145,7 @@
     for(QList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it)
     {
         KisPaintLayer* layer = new KisPaintLayer(img.data(),
-            i18n("Page %1").arg( *it + 1),
+            i18n("Page %1", *it + 1),
             quint8_MAX);
         layer->paintDevice()->convertFromQImage( pdoc->page( *it \
)->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), "");  \
img->addLayer(layer, img->rootLayer(), 0);


[prev in list] [next in list] [prev in thread] [next in thread]