[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: 2007-10-30 21:29:07
Message-ID: 1193779747.511404.17968.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 731176 by rempt:
Fix compilation of filters
M +21 -19 gmagick/kis_image_magick_converter.cc
M +2 -2 gmagick/kis_image_magick_converter.h
M +1 -1 gmagick/magickimport.cpp
M +2 -2 jpeg/kis_jpeg_converter.h
M +1 -1 jpeg/kis_jpeg_export.cc
M +1 -1 jpeg/kis_jpeg_import.cc
M +1 -1 png/kis_png_export.cc
M +1 -1 png/kis_png_import.cc
M +2 -2 tiff/kis_tiff_converter.h
M +1 -1 tiff/kis_tiff_export.cc
M +1 -1 tiff/kis_tiff_import.cc
M +1 -1 tiff/kis_tiff_reader.h
--- trunk/koffice/filters/krita/gmagick/kis_image_magick_converter.cc #731175:731176
@@ -55,6 +55,8 @@
#include "kis_group_layer.h"
#include "kis_paint_device.h"
+// XXX_PROGRESS: fix progress reporting in this (and other?) file filters
+
namespace {
const quint8 PIXEL_BLUE = 0;
@@ -391,7 +393,7 @@
qstrncpy(ii -> filename, QFile::encodeName(uri.path()), MaxTextExtent - 1);
if (ii -> filename[MaxTextExtent - 1]) {
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_PATH;
}
@@ -405,11 +407,11 @@
if (images == 0) {
DestroyImageInfo(ii);
DestroyExceptionInfo(&ei);
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_FAILURE;
}
- emit notifyProgressStage(i18n("Importing..."), 0);
+// emit notifyProgressStage(i18n("Importing..."), 0);
m_img = 0;
@@ -456,7 +458,7 @@
DestroyExceptionInfo(&ei);
DestroyImageList(images);
DestroyImageInfo(ii);
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_UNSUPPORTED_COLORSPACE;
}
@@ -514,7 +516,7 @@
DestroyImageList(images);
DestroyImageInfo(ii);
DestroyExceptionInfo(&ei);
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_FAILURE;
}
@@ -623,7 +625,7 @@
}
}
- emit notifyProgress(y * 100 / image->rows);
+// emit notifyProgress(y * 100 / image->rows);
if (m_stop) {
CloseCacheView(vi);
@@ -640,12 +642,12 @@
layer->setDirty();
}
- emit notifyProgressDone();
+// emit notifyProgressDone();
CloseCacheView(vi);
DestroyImage(image);
}
- emit notifyProgressDone();
+// emit notifyProgressDone();
DestroyImageList(images);
DestroyImageInfo(ii);
DestroyExceptionInfo(&ei);
@@ -717,7 +719,7 @@
qstrncpy(ii -> filename, QFile::encodeName(uri.path()), MaxTextExtent - 1);
if (ii -> filename[MaxTextExtent - 1]) {
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_PATH;
}
@@ -774,7 +776,7 @@
if (!pp) {
DestroyExceptionInfo(&ei);
DestroyImage(image);
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return KisImageBuilder_RESULT_FAILURE;
}
@@ -891,7 +893,7 @@
return KisImageBuilder_RESULT_INVALID_ARG;
}
- emit notifyProgressStage(i18n("Saving..."), y * 100 / height);
+// emit notifyProgressStage(i18n("Saving..."), y * 100 / height);
#ifdef HAVE_MAGICK6
if (SyncImagePixels(image) == MagickFalse)
@@ -911,14 +913,14 @@
WriteImage(ii, image);
DestroyExceptionInfo(&ei);
DestroyImage(image);
- emit notifyProgressDone();
+// emit notifyProgressDone();
return KisImageBuilder_RESULT_OK;
}
void KisImageMagickConverter::ioData(KIO::Job *job, const QByteArray& data)
{
if (data.isNull() || data.isEmpty()) {
- emit notifyProgressStage(i18n("Loading..."), 0);
+// emit notifyProgressStage(i18n("Loading..."), 0);
return;
}
@@ -935,20 +937,20 @@
DestroyExceptionInfo(&ei);
DestroyImageInfo(ii);
job -> kill();
- emit notifyProgressError();
+ // XXX_PROGRESS (was: emit notifyProgressError();
return;
}
DestroyImage(image);
DestroyExceptionInfo(&ei);
DestroyImageInfo(ii);
- emit notifyProgressStage(i18n("Loading..."), 0);
+// emit notifyProgressStage(i18n("Loading..."), 0);
}
Q_ASSERT(data.size() + m_data.size() <= m_size);
memcpy(&m_data[m_data.size()], data.data(), data.count());
m_data.resize(m_data.size() + data.count());
- emit notifyProgressStage(i18n("Loading..."), m_data.size() * 100 / m_size);
+// emit notifyProgressStage(i18n("Loading..."), m_data.size() * 100 / m_size);
if (m_stop)
job -> kill();
@@ -958,8 +960,8 @@
{
m_job = 0;
- if (job -> error())
- emit notifyProgressError();
+// if (job -> error())
+ // XXX_PROGRESS (was: emit notifyProgressError();
decode(KUrl(), true);
}
@@ -968,7 +970,7 @@
{
m_size = size;
m_data.reserve(size);
- emit notifyProgressStage(i18n("Loading..."), 0);
+// emit notifyProgressStage(i18n("Loading..."), 0);
}
void KisImageMagickConverter::cancel()
--- trunk/koffice/filters/krita/gmagick/kis_image_magick_converter.h #731175:731176
@@ -25,7 +25,7 @@
#include <kio/job.h>
#include <kis_global.h>
-#include <kis_progress_subject.h>
+
#include <kis_types.h>
class QString;
@@ -58,7 +58,7 @@
/**
* Build a KisImage representation of an image file.
*/
-class KisImageMagickConverter : public KisProgressSubject {
+class KisImageMagickConverter : public QObject {
typedef QObject super;
Q_OBJECT
--- trunk/koffice/filters/krita/gmagick/magickimport.cpp #731175:731176
@@ -26,7 +26,7 @@
#include <kis_doc2.h>
#include <kis_view2.h>
#include <kis_image_magick_converter.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_image.h>
#include <kis_layer.h>
--- trunk/koffice/filters/krita/jpeg/kis_jpeg_converter.h #731175:731176
@@ -30,8 +30,8 @@
#include <kio/job.h>
-#include <kis_progress_subject.h>
+
#include "kis_types.h"
#include "kis_annotation.h"
class KisDoc2;
@@ -67,7 +67,7 @@
class Store;
}
-class KisJPEGConverter : public KisProgressSubject {
+class KisJPEGConverter : public QObject {
Q_OBJECT
public:
KisJPEGConverter(KisDoc2 *doc, KisUndoAdapter *adapter);
--- trunk/koffice/filters/krita/jpeg/kis_jpeg_export.cc #731175:731176
@@ -32,7 +32,7 @@
#include <kis_image.h>
#include <kis_group_layer.h>
#include <kis_paint_layer.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_node_visitor.h>
#include "kis_jpeg_converter.h"
--- trunk/koffice/filters/krita/jpeg/kis_jpeg_import.cc #731175:731176
@@ -25,7 +25,7 @@
#include <kis_doc2.h>
#include <kis_image.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_view2.h>
#include "kis_jpeg_converter.h"
--- trunk/koffice/filters/krita/png/kis_png_export.cc #731175:731176
@@ -32,7 +32,7 @@
#include <kis_doc2.h>
#include <kis_image.h>
#include <kis_paint_layer.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_iterators_pixel.h>
#include "kis_png_converter.h"
--- trunk/koffice/filters/krita/png/kis_png_import.cc #731175:731176
@@ -25,7 +25,7 @@
#include <kis_doc2.h>
#include <kis_image.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_view2.h>
#include "kis_png_converter.h"
--- trunk/koffice/filters/krita/tiff/kis_tiff_converter.h #731175:731176
@@ -27,8 +27,8 @@
#include <kio/job.h>
-#include <kis_progress_subject.h>
+
#include "kis_types.h"
#include "kis_global.h"
#include "kis_annotation.h"
@@ -66,7 +66,7 @@
quint16 pixarLogCompress;
};
-class KisTIFFConverter : public KisProgressSubject {
+class KisTIFFConverter : public QObject {
Q_OBJECT
public:
KisTIFFConverter(KisDoc2 *doc, KisUndoAdapter *adapter);
--- trunk/koffice/filters/krita/tiff/kis_tiff_export.cc #731175:731176
@@ -32,8 +32,8 @@
#include <kis_group_layer.h>
#include <kis_image.h>
#include <kis_paint_layer.h>
-#include <kis_progress_display_interface.h>
+
#include "kis_tiff_converter.h"
#include "kis_dlg_options_tiff.h"
#include "kis_wdg_options_tiff.h"
--- trunk/koffice/filters/krita/tiff/kis_tiff_import.cc #731175:731176
@@ -25,7 +25,7 @@
#include <kis_doc2.h>
#include <kis_image.h>
-#include <kis_progress_display_interface.h>
+
#include <kis_view2.h>
#include "kis_tiff_converter.h"
--- trunk/koffice/filters/krita/tiff/kis_tiff_reader.h #731175:731176
@@ -28,7 +28,7 @@
// #include <qvaluevector.h>
// #include <kio/job.h>
-// #include <kis_progress_subject.h>
+//
#include <kis_paint_device.h>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic