merge with master

[apps/home/mobileprint.git] / mobileprint / previewgen / lib / image_scaler.c

diff --git a/mobileprint/previewgen/lib/image_scaler.c b/mobileprint/previewgen/lib/image_scaler.c
index 9fca6fc..93a4c99 100644 (file)
--- a/mobileprint/previewgen/lib/image_scaler.c
+++ b/mobileprint/previewgen/lib/image_scaler.c
@@ -40,7 +40,7 @@ int downscale_image(const char *fname, const char *outfname_ppm,
        struct size_px size_limits;
 
        PGEN_TRACE_BEGIN;
-       PTS_RETV_IF(fname == NULL || outfname_ppm == NULL || available_size == NULL, -1, "Invalid argument");
+       PGEN_RETV_IF(fname == NULL || outfname_ppm == NULL || available_size == NULL, -1, "Invalid argument");
 
        PGEN_DEBUG("available_size(%d,%d)",available_size->x, available_size->y);
 
@@ -52,7 +52,7 @@ int downscale_image(const char *fname, const char *outfname_ppm,
                return -1;
        }
 
-       PTS_RETV_IF(rw <= 0 || rh <= 0, -1, "Failed to get resolution");
+       PGEN_RETV_IF(rw <= 0 || rh <= 0, -1, "Failed to get resolution");
 
        rsize.x = rw;
        rsize.y = rh;
@@ -73,7 +73,7 @@ int downscale_image(const char *fname, const char *outfname_ppm,
        PGEN_DEBUG("canvas init, (%d; %d)", pic_size.x, pic_size.y);
 
        canvas = create_canvas(&pic_size);
-       PTS_RETV_IF(canvas == NULL, -1, "canvas is NULL");
+       PGEN_RETV_IF(canvas == NULL, -1, "canvas is NULL");
 
        /*PGEN_DEBUG("new image");*/
        img = evas_object_image_filled_add(canvas);