Changeset 2821 for libcaca/trunk/src/common-image.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (14 years ago)

Author:

Sam Hocevar

Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:

• libcaca/trunk/src/common-image.c (modified) (12 diffs)

libcaca/trunk/src/common-image.c

@@ -24 +24 @@
 #endif
 
-#include "cucul.h"
+#include "caca.h"
 
 #include "common-image.h"
 
 #if !defined(USE_IMLIB2)
-static unsigned int u32fread(cucul_file_t *);
-static unsigned int u16fread(cucul_file_t *);
-static unsigned int u8fread(cucul_file_t *);
+static unsigned int u32fread(caca_file_t *);
+static unsigned int u16fread(caca_file_t *);
+static unsigned int u8fread(caca_file_t *);
 #endif
 
@@ -62 +62 @@
     depth = 4;
 
-    /* Create the libcucul dither */
-    im->dither = cucul_create_dither(bpp, im->w, im->h, depth * im->w,
+    /* Create the libcaca dither */
+    im->dither = caca_create_dither(bpp, im->w, im->h, depth * im->w,
                                      rmask, gmask, bmask, amask);
     if(!im->dither)
@@ -78 +78 @@
     unsigned int red[256], green[256], blue[256], alpha[256];
     unsigned int i, colors, offset, tmp, planes;
-    cucul_file_t *f;
-
-    f = cucul_file_open(name, "rb");
+    caca_file_t *f;
+
+    f = caca_file_open(name, "rb");
     if(!f)
     {
@@ -89 +89 @@
     if(u16fread(f) != 0x4d42)
     {
-        cucul_file_close(f);
+        caca_file_close(f);
         free(im);
         return NULL;
@@ -111 +111 @@
         if(tmp != 0)
         {
-            cucul_file_close(f);
+            caca_file_close(f);
             free(im);
             return NULL;
@@ -150 +150 @@
     else
     {
-        cucul_file_close(f);
+        caca_file_close(f);
         free(im);
         return NULL;
@@ -164 +164 @@
     if(!im->w || im->w > 0x10000 || !im->h || im->h > 0x10000 || planes != 1)
     {
-        cucul_file_close(f);
+        caca_file_close(f);
         free(im);
         return NULL;
@@ -173 +173 @@
     if(!im->pixels)
     {
-        cucul_file_close(f);
+        caca_file_close(f);
         free(im);
         return NULL;
@@ -209 +209 @@
             default:
                 /* Works for 8bpp, but also for 16, 24 etc. */
-                cucul_file_read(f, im->pixels + im->w * i * depth,
+                caca_file_read(f, im->pixels + im->w * i * depth,
                                 im->w * depth);
                 /* Pad reads to 4 bytes */
@@ -241 +241 @@
     }
 
-    cucul_file_close(f);
-
-    /* Create the libcucul dither */
-    im->dither = cucul_create_dither(bpp, im->w, im->h, depth * im->w,
+    caca_file_close(f);
+
+    /* Create the libcaca dither */
+    im->dither = caca_create_dither(bpp, im->w, im->h, depth * im->w,
                                      rmask, gmask, bmask, amask);
     if(!im->dither)
@@ -254 +254 @@
 
     if(bpp == 8)
-        cucul_set_dither_palette(im->dither, red, green, blue, alpha);
+        caca_set_dither_palette(im->dither, red, green, blue, alpha);
 #endif
 
@@ -268 +268 @@
     free(im->pixels);
 #endif
-    cucul_free_dither(im->dither);
+    caca_free_dither(im->dither);
 }
 
 #if !defined(USE_IMLIB2)
-static unsigned int u32fread(cucul_file_t * f)
+static unsigned int u32fread(caca_file_t * f)
 {
     uint8_t buffer[4];
-    cucul_file_read(f, buffer, 4);
+    caca_file_read(f, buffer, 4);
     return ((unsigned int)buffer[3] << 24) | ((unsigned int)buffer[2] << 16)
              | ((unsigned int)buffer[1] << 8) | ((unsigned int)buffer[0]);
 }
 
-static unsigned int u16fread(cucul_file_t * f)
+static unsigned int u16fread(caca_file_t * f)
 {
     uint8_t buffer[2];
-    cucul_file_read(f, buffer, 2);
+    caca_file_read(f, buffer, 2);
     return ((unsigned int)buffer[1] << 8) | ((unsigned int)buffer[0]);
 }
 
-static unsigned int u8fread(cucul_file_t * f)
+static unsigned int u8fread(caca_file_t * f)
 {
     uint8_t buffer;
-    cucul_file_read(f, &buffer, 1);
+    caca_file_read(f, &buffer, 1);
     return (unsigned int)buffer;
 }