summaryrefslogtreecommitdiff
path: root/libgphoto2/ahd_bayer.c
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-07-19 11:28:00 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-07-19 11:28:00 +0000
commit454b76fbe4eb16de8fec2e9865147d6b98ce6c24 (patch)
tree2993c522dadcf782d27735a7ae8e3cb78e88a7b7 /libgphoto2/ahd_bayer.c
parent8aa25d2075bc01ba4d9895ab7c8adef0cfb27547 (diff)
downloadlibgphoto2-454b76fbe4eb16de8fec2e9865147d6b98ce6c24.tar.gz
From: Axel Waggershauser <awagger@web.de>
2) only replaces the existing GP_DEBUG with the new GP_LOG_D and removes the GP_MODULE strings git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15079 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2/ahd_bayer.c')
-rw-r--r--libgphoto2/ahd_bayer.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/libgphoto2/ahd_bayer.c b/libgphoto2/ahd_bayer.c
index e5c6b5ac3..ab59ac7b8 100644
--- a/libgphoto2/ahd_bayer.c
+++ b/libgphoto2/ahd_bayer.c
@@ -50,8 +50,6 @@
#include <gphoto2/gphoto2-result.h>
#include <gphoto2/gphoto2-port-log.h>
-#define GP_MODULE "ahd_bayer"
-
#define MAX(x,y) ((x < y) ? (y) : (x))
#define MIN(x,y) ((x > y) ? (y) : (x))
#define CLAMP(x) MAX(MIN(x,0xff),0)
@@ -428,20 +426,20 @@ int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile)
window_h = calloc (w * 18, 1);
if (!window_h) {
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
window_v = calloc(w * 18, 1);
if (!window_v) {
free (window_h);
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
homo_h = calloc(w*3, 1);
if (!homo_h) {
free (window_v);
free (window_h);
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
homo_v = calloc(w*3, 1);
@@ -449,7 +447,7 @@ int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile)
free (window_v);
free (window_h);
free (homo_h);
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
homo_ch = calloc (w, 1);
@@ -458,7 +456,7 @@ int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile)
free (window_h);
free (homo_h);
free (homo_v);
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
homo_cv = calloc (w, 1);
@@ -468,7 +466,7 @@ int gp_ahd_interpolate (unsigned char *image, int w, int h, BayerTile tile)
free (homo_ch);
free (homo_v);
free (homo_h);
- GP_DEBUG("Out of memory\n");
+ GP_LOG_E ("Out of memory\n");
return GP_ERROR_NO_MEMORY;
}
switch (tile) {