geeqie: src/image.c comparison

comparison src/image.c @ 495:c7a2471e5c4e

Introduce macros to display debug messages. if (debug) printf(...) is now replaced by variadic macros: DEBUG_1() And for higher debugging levels: DEBUG_2() DEBUG_3() DEBUG_4()

author	zas_
date	Wed, 23 Apr 2008 20:47:19 +0000
parents	805c3258d228
children	fc9c8a3e1a8b

comparison

equal deleted inserted replaced

-:3bb9a8df6ee9
+:c7a2471e5c4e
 static void image_complete_util(ImageWindow *imd, gint preload)
 {
 	if (imd->il && image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il)) return;
-	if (debug) printf("%s image load completed \"%s\" (%s)\n", get_exec_time(),
+	DEBUG_1("%s image load completed \"%s\" (%s)\n", get_exec_time(),
 			  (preload) ? (imd->read_ahead_fd ? imd->read_ahead_fd->path : "null") :
 				      (imd->image_fd ? imd->image_fd->path : "null"),
 			  (preload) ? "preload" : "current");
 	if (!preload) imd->completed = TRUE;
 						    0.50, 0.50);
 		}
 	if (exif_rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
 	layout_image_overlay_update(layout_find_by_image(imd));
-	if (debug) printf("%s image postprocess done: %s\n", get_exec_time(), imd->image_fd->name);
+	DEBUG_1("%s image postprocess done: %s\n", get_exec_time(), imd->image_fd->name);
 }
 static void image_post_process_alter(ImageWindow *imd, gint clamp)
 {
 	if (imd->delay_alter_type != ALTER_NONE)
 		return;
 		}
 	imd->cm = NULL;
 	image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
-	if (debug) printf("%s image postprocess cm done: %s\n", get_exec_time(), imd->image_fd->name);
+	DEBUG_1("%s image postprocess cm done: %s\n", get_exec_time(), imd->image_fd->name);
 	image_post_process_alter(imd, FALSE);
 	image_read_ahead_start(imd);
 }
 				{
 				input_type = COLOR_PROFILE_SRGB;
 				input_file = NULL;
 				imd->color_profile_from_image = COLOR_PROFILE_SRGB;
-				if (debug) printf("Found EXIF ColorSpace of sRGB\n");
+				DEBUG_1("Found EXIF ColorSpace of sRGB\n");
 				}
 			if (cs == 2 || (interop_index && !strcmp(interop_index, "R03")))
 				{
 				input_type = COLOR_PROFILE_ADOBERGB;
 				input_file = NULL;
 				imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
-				if (debug) printf("Found EXIF ColorSpace of AdobeRGB\n");
+				DEBUG_1("Found EXIF ColorSpace of AdobeRGB\n");
 				}
 			g_free(interop_index);
 			}
 		}
 	if (profile)
 		{
-		if (debug) printf("Found embedded color profile\n");
+		DEBUG_1("Found embedded color profile\n");
 		imd->color_profile_from_image = COLOR_PROFILE_MEM;
 		cm = color_man_new_embedded(run_in_bg ? imd : NULL, NULL,
 					    profile, profile_len,
 					    screen_type, screen_file);
 #if 0
 	ExifData *exif = NULL;
 	if (!image_get_pixbuf(imd)) return;
-	if (debug) printf("%s image postprocess: %s\n", get_exec_time(), imd->image_fd->name);
+	DEBUG_1("%s image postprocess: %s\n", get_exec_time(), imd->image_fd->name);
 	if (options->image.exif_rotate_enable ||
 	    (imd->color_profile_enable && imd->color_profile_use_image) )
 		{
 		exif = exif_read_fd(imd->image_fd);
 *-------------------------------------------------------------------
 */
 static void image_read_ahead_cancel(ImageWindow *imd)
 {
-	if (debug) printf("%s read ahead cancelled for :%s\n", get_exec_time(), imd->read_ahead_fd ? imd->read_ahead_fd->path : "null");
+	DEBUG_1("%s read ahead cancelled for :%s\n", get_exec_time(), imd->read_ahead_fd ? imd->read_ahead_fd->path : "null");
 	image_loader_free(imd->read_ahead_il);
 	imd->read_ahead_il = NULL;
 	if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
 static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
 {
 	ImageWindow *imd = data;
-	if (debug) printf("%s read ahead done for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
+	DEBUG_1("%s read ahead done for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
 	imd->read_ahead_pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
 	if (imd->read_ahead_pixbuf)
 		{
 		g_object_ref(imd->read_ahead_pixbuf);
 	if (!imd->read_ahead_fd || imd->read_ahead_il || imd->read_ahead_pixbuf) return;
 	/* still loading ?, do later */
 	if (imd->il /*|| imd->cm*/) return;
-	if (debug) printf("%s read ahead started for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
+	DEBUG_1("%s read ahead started for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
 	imd->read_ahead_il = image_loader_new(imd->read_ahead_fd);
 	image_loader_set_error_func(imd->read_ahead_il, image_read_ahead_error_cb, imd);
 	if (!image_loader_start(imd->read_ahead_il, image_read_ahead_done_cb, imd))
 	image_read_ahead_cancel(imd);
 	imd->read_ahead_fd = file_data_ref(fd);
-	if (debug) printf("read ahead set to :%s\n", imd->read_ahead_fd->path);
+	DEBUG_1("read ahead set to :%s\n", imd->read_ahead_fd->path);
 	image_read_ahead_start(imd);
 }
 /*
 		imd->prev_fd = NULL;
 		imd->prev_pixbuf = NULL;
 		imd->prev_color_row = -1;
 		}
-	if (debug) printf("%s post buffer set: %s\n", get_exec_time(), fd ? fd->path : "null");
+	DEBUG_1("%s post buffer set: %s\n", get_exec_time(), fd ? fd->path : "null");
 }
 static gint image_post_buffer_get(ImageWindow *imd)
 {
 	gint success;
 static void image_load_done_cb(ImageLoader *il, gpointer data)
 {
 	ImageWindow *imd = data;
-	if (debug) printf ("%s image done\n", get_exec_time());
+	DEBUG_1 ("%s image done\n", get_exec_time());
 	g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
 	image_state_unset(imd, IMAGE_STATE_LOADING);
 	if (imd->delay_flip &&
 	image_read_ahead_start(imd);
 }
 static void image_load_error_cb(ImageLoader *il, gpointer data)
 {
-	if (debug) printf ("%s image error\n", get_exec_time());
+	DEBUG_1 ("%s image error\n", get_exec_time());
 	/* even on error handle it like it was done,
 	 * since we have a pixbuf with _something_ */
 	image_load_done_cb(il, data);
 	return FALSE;
 }
 static gint image_load_begin(ImageWindow *imd, FileData *fd)
 {
-	if (debug) printf ("%s image begin \n", get_exec_time());
+	DEBUG_1 ("%s image begin \n", get_exec_time());
 	if (imd->il) return FALSE;
 	imd->completed = FALSE;
 	g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
 	if (image_post_buffer_get(imd))
 		{
-		if (debug) printf("from post buffer: %s\n", imd->image_fd->path);
+		DEBUG_1("from post buffer: %s\n", imd->image_fd->path);
 		return TRUE;
 		}
 	if (image_read_ahead_check(imd))
 		{
-		if (debug) printf("from read ahead buffer: %s\n", imd->image_fd->path);
+		DEBUG_1("from read ahead buffer: %s\n", imd->image_fd->path);
 		return TRUE;
 		}
 	if (!imd->delay_flip && image_get_pixbuf(imd))
 		{
 	image_loader_set_error_func(imd->il, image_load_error_cb, imd);
 	image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
 	if (!image_loader_start(imd->il, image_load_done_cb, imd))
 		{
-		if (debug) printf("image start error\n");
+		DEBUG_1("image start error\n");
 		g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
 		image_loader_free(imd->il);
 		imd->il = NULL;
 static void image_reset(ImageWindow *imd)
 {
 	/* stops anything currently being done */
-	if (debug) printf("%s image reset\n", get_exec_time());
+	DEBUG_1("%s image reset\n", get_exec_time());
 	g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
 	image_loader_free(imd->il);
 	imd->il = NULL;

Mercurial > geeqie

comparison src/image.c @ 495:c7a2471e5c4e