rsys

commit e1f2092ea7ea0743277c159e2d90f988a5a36f04
parent 18802a1a4568b503741c7af17052ab8a9db927ad
Author: vaplv <vincent.forest@meso-star.com>
Date:   Fri, 31 Mar 2017 14:52:49 +0200

Make deprecated the image_ppm_write API

Diffstat:
M
src/image.h
 | 
4
++--
M
src/test_image.c
 | 
40
----------------------------------------

2 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/src/image.h b/src/image.h
@@ -88,7 +88,7 @@ image_write_ppm_stream
    const int binary,
    FILE* stream);
 
-RSYS_API res_T
+DEPRECATED RSYS_API res_T
 image_ppm_write
   (const char* path,
    const int width,
@@ -96,7 +96,7 @@ image_ppm_write
    const int bytes_per_pixel,
    const unsigned char* buffer);
 
-RSYS_API res_T
+DEPRECATED RSYS_API res_T
 image_ppm_write_stream
   (FILE* stream,
    const int width,
diff --git a/src/test_image.c b/src/test_image.c
@@ -163,7 +163,6 @@ main(int argc, char** argv)
   };
   struct mem_allocator allocator;
   char* pixels;
-  FILE* fp;
   int x, y, i = 0;
   (void)argc, (void)argv;
 
@@ -182,45 +181,6 @@ main(int argc, char** argv)
     ((uint8_t*)pixels)[i++] = lut8[j][k][1];
     ((uint8_t*)pixels)[i++] = lut8[j][k][2];
   }}
-
-  fp = tmpfile();
-  NCHECK(fp, NULL);
-  #define WRITE image_ppm_write_stream
-  CHECK(WRITE(NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, HEIGHT, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, HEIGHT, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, HEIGHT, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, HEIGHT, 0, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, 0, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, 0, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, 0, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, 0, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, HEIGHT, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, HEIGHT, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, HEIGHT, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, HEIGHT, 3, NULL), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, 0, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, 0, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, 0, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, 0, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, HEIGHT, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, HEIGHT, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, HEIGHT, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, HEIGHT, 0, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, 0, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, 0, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, 0, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, 0, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, 0, HEIGHT, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, 0, HEIGHT, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(NULL, WIDTH, HEIGHT, 3, (unsigned char*)pixels), RES_BAD_ARG);
-  CHECK(WRITE(fp, WIDTH, HEIGHT, 3, (unsigned char*)pixels), RES_OK);
-  #undef WRITE
-  rewind(fp);
-
   check(pixels, WIDTH, HEIGHT, IMAGE_RGB8, &allocator);
   MEM_RM(&allocator, pixels);