On 04/01/2013 12:16 PM, Daniel P. Berrange wrote:
I've applied all of them, though I made a few changes along the
way. In particular I split patch 3 into 3 separate patches, and
merged patch 5 into the earlier patch which caused the regression
Thanks Daniel !
I'll try and create a patch for having an option to display the
histogram in linear mode too.
Attached is a patch which clean up some debug messages.
Btw, the v0.5.1 tag is missing in the repo.
Best regards,
Jesper
>From bd133cd1ba768a4556e86dc527617e9c8c72d4e6 Mon Sep 17 00:00:00 2001
From: Jesper Pedersen <jesper.peder...@jboss.org>
Date: Tue, 2 Apr 2013 07:13:03 -0400
Subject: [PATCH] Use ENTANGLE_DEBUG for debug messages
---
src/backend/entangle-image-loader.c | 4 ++--
src/backend/entangle-pixbuf.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/backend/entangle-image-loader.c b/src/backend/entangle-image-loader.c
index f076048..2996a73 100644
--- a/src/backend/entangle-image-loader.c
+++ b/src/backend/entangle-image-loader.c
@@ -84,7 +84,7 @@ static GdkPixbuf *entangle_image_loader_pixbuf_load(EntanglePixbufLoader *loader
GExiv2Metadata **metadata)
{
EntangleImageLoaderPrivate *priv = (ENTANGLE_IMAGE_LOADER(loader))->priv;
- g_printerr("Preview %d\n", priv->embeddedPreview);
+ ENTANGLE_DEBUG("Preview %d\n", priv->embeddedPreview);
if (priv->embeddedPreview)
return entangle_pixbuf_open_image(image,
ENTANGLE_PIXBUF_IMAGE_SLOT_PREVIEW,
@@ -151,7 +151,7 @@ gboolean entangle_image_loader_get_embedded_preview(EntangleImageLoader *loader)
void entangle_image_loader_set_embedded_preview(EntangleImageLoader *loader, gboolean enable)
{
EntangleImageLoaderPrivate *priv = loader->priv;
- g_printerr("Set preview %d\n", enable);
+ ENTANGLE_DEBUG("Set preview %d\n", enable);
priv->embeddedPreview = enable;
entangle_pixbuf_loader_trigger_reload(ENTANGLE_PIXBUF_LOADER(loader));
}
diff --git a/src/backend/entangle-pixbuf.c b/src/backend/entangle-pixbuf.c
index 78f583f..3a1447b 100644
--- a/src/backend/entangle-pixbuf.c
+++ b/src/backend/entangle-pixbuf.c
@@ -184,7 +184,7 @@ static GdkPixbuf *entangle_pixbuf_open_image_master_raw(EntangleImage *image)
goto cleanup;
}
- g_printerr("Raw %dx%d %s\n", img->width, img->height, entangle_image_get_filename(image));
+ ENTANGLE_DEBUG("Raw %dx%d %s\n", img->width, img->height, entangle_image_get_filename(image));
ENTANGLE_DEBUG("New pixbuf %s", entangle_image_get_filename(image));
result = gdk_pixbuf_new_from_data(img->data,
GDK_COLORSPACE_RGB,
@@ -234,7 +234,7 @@ static GdkPixbuf *entangle_pixbuf_open_image_master(EntangleImage *image,
GExiv2Metadata *metadata,
gboolean applyOrientation)
{
- g_printerr("Load master %s\n", entangle_image_get_filename(image));
+ ENTANGLE_DEBUG("Load master %s\n", entangle_image_get_filename(image));
if (entangle_pixbuf_is_raw(image))
return entangle_pixbuf_open_image_master_raw(image);
else
@@ -436,7 +436,7 @@ static GdkPixbuf *entangle_pixbuf_open_image_preview(EntangleImage *image,
gboolean applyOrientation)
{
GdkPixbuf *result = NULL;
- g_printerr("Load previdew %s\n", entangle_image_get_filename(image));
+ ENTANGLE_DEBUG("Load preview %s\n", entangle_image_get_filename(image));
if (entangle_pixbuf_is_raw(image)) {
result = entangle_pixbuf_open_image_preview_raw(image, metadata, applyOrientation);
if (!result && metadata)
@@ -446,7 +446,7 @@ static GdkPixbuf *entangle_pixbuf_open_image_preview(EntangleImage *image,
} else {
result = entangle_pixbuf_open_image_master_gdk(image, metadata, applyOrientation);
}
- g_printerr("Load previdew done %s\n", entangle_image_get_filename(image));
+ ENTANGLE_DEBUG("Load preview done %s\n", entangle_image_get_filename(image));
return result;
}
@@ -456,7 +456,7 @@ static GdkPixbuf *entangle_pixbuf_open_image_thumbnail(EntangleImage *image,
gboolean applyOrientation)
{
GdkPixbuf *result = NULL;
- g_printerr("Load tnhumbnail %s\n", entangle_image_get_filename(image));
+ ENTANGLE_DEBUG("Load thumbnail %s\n", entangle_image_get_filename(image));
if (entangle_pixbuf_is_raw(image))
result = entangle_pixbuf_open_image_preview_raw(image, metadata, applyOrientation);
if (!result && metadata)
--
1.8.1.4
_______________________________________________
Entangle-devel mailing list
Entangle-devel@gna.org
https://mail.gna.org/listinfo/entangle-devel
