Revert "evas png: apply interpolation when scale down image loading."
authorHermet Park <hermetpark@gmail.com>
Thu, 2 May 2019 11:19:24 +0000 (20:19 +0900)
committerHermet Park <hermetpark@gmail.com>
Wed, 8 May 2019 04:30:08 +0000 (13:30 +0900)
This reverts commit 53cdf850ba0f10a4a4db3e3c7f7cf1742ca88db1.

It's still on reviewing, I didn't intend submitting.

src/examples/evas/Makefile.examples
src/examples/evas/evas-images6.c [deleted file]
src/examples/evas/meson.build
src/examples/evas/resources/images/scale_down.png [deleted file]
src/modules/evas/image_loaders/png/evas_image_load_png.c

index 78e255c..e2e6f75 100644 (file)
@@ -16,7 +16,6 @@ EXAMPLES= evas-aspect-hints \
           evas-images3 \
           evas-images4 \
           evas-images5 \
-          evas-images6 \
           evas-init-shutdown \
           evas-map-utils \
           evas-object-manipulation \
diff --git a/src/examples/evas/evas-images6.c b/src/examples/evas/evas-images6.c
deleted file mode 100644 (file)
index ac09b44..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Example of handling events for image objects in Evas.
- *
- * You'll need at least one engine built for it (excluding the buffer
- * one) and the png image loader/saver also built. See stdout/stderr
- * for output.
- *
- * @verbatim
- * gcc -o evas-images6 evas-images6.c `pkg-config --libs --cflags evas ecore ecore-evas`
- * @endverbatim
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#else
-#define PACKAGE_EXAMPLES_DIR "."
-#endif
-
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <stdio.h>
-#include <errno.h>
-#include "evas-common.h"
-
-#define WIDTH  (960)
-#define HEIGHT (540)
-
-static const char *img_path = PACKAGE_EXAMPLES_DIR EVAS_IMAGE_FOLDER "/scale_down.png";
-
-struct test_data
-{
-   Ecore_Evas  *ee;
-   Evas        *evas;
-   Evas_Object *bg, *img;
-};
-
-static struct test_data d = {0};
-
-
-static void
-_on_destroy(Ecore_Evas *ee EINA_UNUSED)
-{
-   ecore_main_loop_quit();
-}
-
-/* Keep the example's window size in sync with the background image's size */
-static void
-_canvas_resize_cb(Ecore_Evas *ee)
-{
-   int w, h;
-
-   ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
-   evas_object_resize(d.bg, w, h);
-}
-
-int
-main(void)
-{
-   if (!ecore_evas_init())
-     return EXIT_FAILURE;
-
-   /* this will give you a window with an Evas canvas under the first
-    * engine available */
-   d.ee = ecore_evas_new(NULL, 10, 10, WIDTH, HEIGHT, NULL);
-   if (!d.ee)
-     goto error;
-
-   ecore_evas_callback_destroy_set(d.ee, _on_destroy);
-   ecore_evas_callback_resize_set(d.ee, _canvas_resize_cb);
-   ecore_evas_show(d.ee);
-
-   /* the canvas pointer, de facto */
-   d.evas = ecore_evas_get(d.ee);
-
-   d.bg = evas_object_rectangle_add(d.evas);
-   evas_object_color_set(d.bg, 255, 255, 255, 255); /* white bg */
-   evas_object_move(d.bg, 0, 0); /* at canvas' origin */
-   evas_object_resize(d.bg, WIDTH, HEIGHT); /* covers full canvas */
-   evas_object_show(d.bg);
-
-   d.img = evas_object_image_filled_add(d.evas);
-   evas_object_image_file_set(d.img, img_path, NULL);
-   evas_object_image_load_scale_down_set(d.img, 2);
-   evas_object_resize(d.img, WIDTH, HEIGHT);
-   evas_object_show(d.img);
-
-   ecore_main_loop_begin();
-
-   ecore_evas_free(d.ee);
-   ecore_evas_shutdown();
-   return 0;
-
-error:
-   fprintf(stderr, "error: Requires at least one Evas engine built and linked"
-                   " to ecore-evas for this example to run properly.\n");
-   ecore_evas_shutdown();
-   return -1;
-}
index 9a9bd1f..34c8bd3 100644 (file)
@@ -29,7 +29,6 @@ examples = [
   'evas-images3',
   'evas-images4',
   'evas-images5',
-  'evas-images6',
   'evas-images',
   'evas-init-shutdown',
   'evas-map-aa',
diff --git a/src/examples/evas/resources/images/scale_down.png b/src/examples/evas/resources/images/scale_down.png
deleted file mode 100644 (file)
index ff4bdc4..0000000
Binary files a/src/examples/evas/resources/images/scale_down.png and /dev/null differ
index 6d0c1e9..db8fb50 100644 (file)
@@ -259,6 +259,7 @@ evas_image_load_file_data_png(void *loader_data,
    Eina_File *f;
 
    unsigned char *surface;
+   unsigned char *tmp_line;
    png_structp png_ptr = NULL;
    png_infop info_ptr = NULL;
    Evas_PNG_Info epi;
@@ -413,7 +414,7 @@ evas_image_load_file_data_png(void *loader_data,
      }
 
    passes = png_set_interlace_handling(png_ptr);
-
+   
    /* we read image line by line if scale down was set */
    if (scale_ratio == 1 && region_set == 0)
      {
@@ -427,7 +428,6 @@ evas_image_load_file_data_png(void *loader_data,
    else
      {
         unsigned char *src_ptr;
-        unsigned char *dst_ptr = surface;
         int skip_row = 0, region_x = 0, region_y = 0;
 
         if (region_set)
@@ -438,86 +438,51 @@ evas_image_load_file_data_png(void *loader_data,
 
         if (passes == 1)
           {
-             int line_size = (image_w * pack_offset) - (region_x * pack_offset);
-             unsigned char *tmp_line = (unsigned char *) alloca(image_w * pack_offset);
-             //accumulate pixel color here.
-             unsigned short *interp_buf = (unsigned short *) alloca(line_size * sizeof(unsigned short));
-             unsigned short *pbuf;
+             tmp_line = (unsigned char *) alloca(image_w * pack_offset);
 
              for (skip_row = 0; skip_row < region_y; skip_row++)
                png_read_row(png_ptr, tmp_line, NULL);
 
-             png_read_row(png_ptr, tmp_line, NULL);
-             src_ptr = tmp_line + (region_x * pack_offset);
-
-             //The first pixel, of the first line
-             for (k = 0; k < (int) pack_offset; k++)
-               dst_ptr[k] = src_ptr[k];
-
-             dst_ptr += pack_offset;
-             src_ptr += (scale_ratio * pack_offset);
-
-             for (j = 1; j < w; j++)
+             //general case: 4 bytes pixel.
+             if (pack_offset == sizeof(DATA32))
                {
-                  //rgba
-                  interp_buf[0] = 0;
-                  interp_buf[1] = 0;
-                  interp_buf[2] = 0;
-                  interp_buf[3] = 0;
-
-                  //horizontal interpolation.
-                  for (p = 0; p < scale_ratio; p++)
+                  DATA32 *dst_ptr = (DATA32 *) surface;
+                  DATA32 *src_ptr2;
+
+                  for (i = 0; i < h; i++)
                     {
-                       for (k = 0; k < (int) pack_offset; k++)
-                         interp_buf[k] += src_ptr[k - (int)(p * pack_offset)];
-                    }
-                  for (k = 0; k < (int) pack_offset; k++)
-                    dst_ptr[k] = (interp_buf[k] / scale_ratio);
+                       png_read_row(png_ptr, tmp_line, NULL);
+                       src_ptr2 = (DATA32 *) (tmp_line + region_x * pack_offset);
 
-                  dst_ptr += pack_offset;
-                  src_ptr += (scale_ratio * pack_offset);
+                       for (j = 0; j < w; j++)
+                         {
+                            *dst_ptr = *src_ptr2;
+                            ++dst_ptr;
+                            src_ptr2 += scale_ratio;
+                         }
+                       for (j = 0; j < (scale_ratio - 1); j++)
+                         png_read_row(png_ptr, tmp_line, NULL);
+                    }
                }
-
-             //next lines
-             for (i = 1; i < h; i++)
+             else
                {
-                  memset(interp_buf, 0x00, line_size * sizeof(unsigned short));
+                  unsigned char *dst_ptr = surface;
 
-                  //vertical interpolation.
-                  for (j = 0; j < scale_ratio; j++)
+                  for (i = 0; i < h; i++)
                     {
                        png_read_row(png_ptr, tmp_line, NULL);
-                       src_ptr = tmp_line + (region_x * pack_offset);
+                       src_ptr = tmp_line + region_x * pack_offset;
 
-                      for (p = 0; p < line_size; ++p)
-                         interp_buf[p] += src_ptr[p];
-                    }
-
-                  for (p = 0; p < line_size; ++p)
-                    interp_buf[p] /= scale_ratio;
-
-                  pbuf = interp_buf;
-
-                  //The first pixel of the current line
-                  for (k = 0; k < (int) pack_offset; k++)
-                    dst_ptr[k] = pbuf[k];
-
-                  dst_ptr += pack_offset;
-                  pbuf += scale_ratio * pack_offset;
-
-                  for (j = 1; j < w; j++)
-                    {
-                       //horizontal interpolation.
-                       for (p = 1; p < scale_ratio; ++p)
+                       for (j = 0; j < w; j++)
                          {
                             for (k = 0; k < (int) pack_offset; k++)
-                              pbuf[k] += pbuf[k - (int)(p * pack_offset)];
-                         }
-                       for (k = 0; k < (int) pack_offset; k++)
-                         dst_ptr[k] = (pbuf[k] / scale_ratio);
+                              dst_ptr[k] = src_ptr[k];
 
-                       dst_ptr += pack_offset;
-                       pbuf += (scale_ratio * pack_offset);
+                            dst_ptr += pack_offset;
+                            src_ptr += scale_ratio * pack_offset;
+                         }
+                       for (j = 0; j < (scale_ratio - 1); j++)
+                         png_read_row(png_ptr, tmp_line, NULL);
                     }
                }
 
@@ -526,8 +491,6 @@ evas_image_load_file_data_png(void *loader_data,
           }
         else
           {
-             //TODO: Scale-down interpolation for multi-pass?
-
              unsigned char *pixels2 = malloc(image_w * image_h * pack_offset);
 
              if (pixels2)