Changeset 2821 for libcaca/trunk/ruby/caca-dither.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/ruby/caca-dither.c (moved) (moved from libcaca/trunk/ruby/cucul-dither.c) (8 diffs)

libcaca/trunk/ruby/caca-dither.c

@@ -1 +1 @@
 /*
- *  libcucul Ruby bindings
+ *  libcaca Ruby bindings
  *  Copyright (c) 2007 Pascal Terjan <pterjan@linuxfr.org>
  *
@@ -11 +11 @@
 
 #include <ruby.h>
-#include <cucul.h>
+#include <caca.h>
 #include <errno.h>
 #include "common.h"
@@ -19 +19 @@
 void dither_free(void *dither)
 {
-    cucul_free_dither((cucul_dither_t *)dither);
+    caca_free_dither((caca_dither_t *)dither);
 }
 
@@ -31 +31 @@
 static VALUE dither_initialize(VALUE self, VALUE bpp, VALUE w, VALUE h, VALUE pitch, VALUE rmask, VALUE gmask, VALUE bmask, VALUE amask)
 {
-    cucul_dither_t *dither;
-
-    dither = cucul_create_dither(NUM2UINT(bpp), NUM2UINT(w), NUM2UINT(h), NUM2UINT(pitch), NUM2ULONG(rmask), NUM2ULONG(gmask), NUM2ULONG(bmask), NUM2ULONG(amask));
+    caca_dither_t *dither;
+
+    dither = caca_create_dither(NUM2UINT(bpp), NUM2UINT(w), NUM2UINT(h), NUM2UINT(pitch), NUM2ULONG(rmask), NUM2ULONG(gmask), NUM2ULONG(bmask), NUM2ULONG(amask));
     if(dither == NULL)
     {
@@ -116 +116 @@
     }
 
-    if(cucul_set_dither_palette(_SELF, red, green, blue, alpha)<0)
+    if(caca_set_dither_palette(_SELF, red, green, blue, alpha)<0)
     {
         free(red);
@@ -142 +142 @@
 static VALUE set_##x(VALUE self, VALUE x)              \
 {                                                       \
-    if(cucul_set_dither_##x(_SELF, (float)NUM2DBL(x))<0)\
+    if(caca_set_dither_##x(_SELF, (float)NUM2DBL(x))<0)\
         rb_raise(rb_eRuntimeError, strerror(errno));    \
                                                         \
@@ -162 +162 @@
 static VALUE set_dither_##x(VALUE self, VALUE x)         \
 {                                                        \
-    if(cucul_set_dither_##x(_SELF, StringValuePtr(x))<0) \
+    if(caca_set_dither_##x(_SELF, StringValuePtr(x))<0) \
     {                                                    \
         rb_raise(rb_eRuntimeError, strerror(errno));     \
@@ -180 +180 @@
 get_set_str_from_list(algorithm)
 
-void Init_cucul_dither(VALUE mCucul)
+void Init_caca_dither(VALUE mCucul)
 {
     cDither = rb_define_class_under(mCucul, "Dither", rb_cObject);