Conf: Rewritten configuration parser to support multiple contexts (step 1)

[libucw.git] / images / scale.c

diff --git a/images/scale.c b/images/scale.c
index 925733a192e78f99e87a46e04dd27b0c83e71f9f..26b49f4d0b41e1382c0ed0bf51ec8bf7e3502232 100644 (file)
--- a/images/scale.c
+++ b/images/scale.c
@@ -9,10 +9,10 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "images/images.h"
-#include "images/error.h"
-#include "images/math.h"
+#include <ucw/lib.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/math.h>
 
 #include <string.h>
 
@@ -26,19 +26,19 @@
 
 #define IMAGE_SCALE_PREFIX(x) image_scale_1_##x
 #define IMAGE_SCALE_PIXEL_SIZE 1
-#include "images/scale-gen.h"
+#include <images/scale-gen.h>
 
 #define IMAGE_SCALE_PREFIX(x) image_scale_2_##x
 #define IMAGE_SCALE_PIXEL_SIZE 2
-#include "images/scale-gen.h"
+#include <images/scale-gen.h>
 
 #define IMAGE_SCALE_PREFIX(x) image_scale_3_##x
 #define IMAGE_SCALE_PIXEL_SIZE 3
-#include "images/scale-gen.h"
+#include <images/scale-gen.h>
 
 #define IMAGE_SCALE_PREFIX(x) image_scale_4_##x
 #define IMAGE_SCALE_PIXEL_SIZE 4
-#include "images/scale-gen.h"
+#include <images/scale-gen.h>
 
 /* Simple "nearest neighbour" algorithm */
 
@@ -226,7 +226,7 @@ image_scale(struct image_context *ctx, struct image *dest, struct image *src)
     }
   else
     {
-      if (dest->cols <= src->cols && src->cols <= dest->cols)
+      if (dest->cols <= src->cols && dest->rows <= src->rows)
         {
          /* Downscale in both dimensions */
           image_scale_downsample_xy(dest, src);
@@ -241,7 +241,7 @@ image_scale(struct image_context *ctx, struct image *dest, struct image *src)
 }
 
 void
-image_dimensions_fit_to_box(u32 *cols, u32 *rows, u32 max_cols, u32 max_rows, uns upsample)
+image_dimensions_fit_to_box(uns *cols, uns *rows, uns max_cols, uns max_rows, uns upsample)
 {
   ASSERT(image_dimensions_valid(*cols, *rows));
   ASSERT(image_dimensions_valid(max_cols, max_rows));