Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--INSTALL8
-rw-r--r--colorsc/Makefile21
-rw-r--r--colorsc/canvas.h462
-rw-r--r--colorsc/colorsc.h3
-rw-r--r--colorsc/colorsc.i2
-rw-r--r--colorsc/gtk_types.h130
-rw-r--r--colorsc/setup.py15
7 files changed, 105 insertions, 536 deletions
diff --git a/INSTALL b/INSTALL
index 0a755cb..37415bc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,11 @@
-To build C library(you need swig and python-devel):
+To build C library:
$ make
+you need:
+- swig
+- gtk-devel
+- python-devel
+- gstreamer-devel
+- pygtk-devel
To make regular sugar procedures:
$ ./setup.py
diff --git a/colorsc/Makefile b/colorsc/Makefile
index 3b0055b..87bfff0 100644
--- a/colorsc/Makefile
+++ b/colorsc/Makefile
@@ -1,11 +1,22 @@
+CXXFLAGS = $(shell pkg-config --cflags gdk-x11-2.0) \
+ $(shell pkg-config --cflags gstreamer-0.10) \
+ $(shell pkg-config --cflags pygtk-2.0) \
+ $(shell python-config --cflags) \
+ -fPIC
+LDFLAGS = $(shell pkg-config --libs gdk-x11-2.0) \
+ $(shell pkg-config --libs gstreamer-0.10) \
+ $(shell pkg-config --libs pygtk-2.0) \
+ $(shell python-config --libs)
+
all: _colorsc.so
clean:
- rm -rf _colorsc.so *_wrap.cxx colorsc.py colorsc.pyc build
+ rm -rf _colorsc.so colorsc.cpp colorsc.py colorsc.pyc *.o
-%_wrap.cxx: %.i
- swig -c++ -python $<
+%.cpp: %.i
+ swig -c++ -python -o $*.cpp $<
-_colorsc.so: colorsc_wrap.cxx colorsc.h canvas.h canvas.cpp
- python setup.py build_ext --inplace
+canvas.o: colorsc.h canvas.h
+_colorsc.so: colorsc.o canvas.o
+ $(CXX) -shared $(LDFLAGS) -o $@ $^
diff --git a/colorsc/canvas.h b/colorsc/canvas.h
index 6706c36..6877758 100644
--- a/colorsc/canvas.h
+++ b/colorsc/canvas.h
@@ -18,6 +18,9 @@
#ifndef _CANVAS_H_
#define _CANVAS_H_
+#include <gdk/gdkimage.h>
+#include <gst/gstbuffer.h>
+
#include "colorsc.h"
#include "drwfile.h"
@@ -1039,240 +1042,38 @@ public:
// Draws a region of the canvas into a GdkImage for display on the screen, with optional scaling
// and darkening.
- void blit_1x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
- {
- unsigned short* pixels = (unsigned short*)img->mem;
- int pitch = img->bpl/sizeof(unsigned short);
-
- // Clip destination rectangle. Source clipping is handled per pixel.
- if (dest_x < 0)
- {
- dest_w += dest_x;
- dest_x = 0;
- }
- if (dest_y < 0)
- {
- dest_h += dest_y;
- dest_y = 0;
- }
- if (dest_x+dest_w > img->width)
- dest_w = img->width - dest_x;
- if (dest_y+dest_h > img->height)
- dest_h = img->height - dest_y;
-
- int csy = src_y;
- for (int cdy = dest_y; cdy < dest_y+dest_h; cdy++)
- {
- unsigned short* __restrict row = &pixels[cdy*pitch+dest_x];
-
- // If out of bounds vertically, fill row with the background color.
- if (csy < 0 || csy >= height)
- {
- for (int cdx = 0; cdx < dest_w; cdx++)
- {
- unsigned int rgb = 0;
- *row++ = rgb;
- }
- }
- else
- {
- unsigned int* __restrict src = &image[csy*width+src_x];
-
- int cdx = 0;
- int csx = src_x;
-
- // Fill any portion that is to the left of the src image with
- // background color.
- while (csx < 0 && cdx < dest_w)
- {
- unsigned int rgb = 0;
- *row++ = rgb;
- src++;
- csx++;
- cdx++;
- }
-
- // Copy the pixels.
- if (overlay)
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- p &= ~0x03030303;
- p >>= 2;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- *row++ = rgb;
- src++;
- csx++;
- cdx++;
- }
- }
- else
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- *row++ = rgb;
- src++;
- csx++;
- cdx++;
- }
- }
-
- // Fill any portion to the right of src with background pixels.
- while (cdx < dest_w)
- {
- unsigned int rgb = 0;
- *row++ = rgb;
- src++;
- csx++;
- cdx++;
- }
- }
+ typedef guint16 depth16_t;
+ typedef guint32 depth24_t;
- csy++;
- }
+ inline
+ void to_pixel(guint src, depth16_t *dst)
+ {
+ guint r = (((src>>16)&0xff)>>3)<<11;
+ guint g = (((src>> 8)&0xff)>>2)<<5;
+ guint b = (((src>> 0)&0xff)>>3);
+ *dst = r|g|b;
}
- void blit_2x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ inline
+ void to_pixel(guint src, depth24_t *dst)
{
- unsigned short* pixels = (unsigned short*)img->mem;
- int pitch = img->bpl/sizeof(unsigned short);
-
- // Clip destination rectangle. Source clipping is handled per pixel.
- if (dest_x < 0)
- {
- dest_w += dest_x;
- dest_x = 0;
- }
- if (dest_y < 0)
- {
- dest_h += dest_y;
- dest_y = 0;
- }
- if (dest_x+dest_w > img->width-2)
- dest_w = (img->width-2) - dest_x;
- if (dest_y+dest_h > img->height-2)
- dest_h = (img->height-2) - dest_y;
-
- int csy = src_y;
- for (int cdy = dest_y; cdy < dest_y+dest_h; cdy += 2)
- {
- unsigned short* __restrict row0 = &pixels[cdy*pitch+dest_x];
- unsigned short* __restrict row1 = row0 + pitch;
-
- // If out of bounds vertically, fill row with the background color.
- if (csy < 0 || csy >= height)
- {
- for (int cdx = 0; cdx < dest_w; cdx += 2)
- {
- unsigned int rgb = 0;
- row0[0] = rgb;
- row0[1] = rgb;
- row1[0] = rgb;
- row1[1] = rgb;
- row0 += 2;
- row1 += 2;
- }
- }
- else
- {
- unsigned int* __restrict src = &image[csy*width+src_x];
-
- int cdx = 0;
- int csx = src_x;
-
- // Fill any portion that is to the left of the src image with
- // background color.
- while (csx < 0 && cdx < dest_w)
- {
- unsigned int rgb = 0;
- row0[0] = rgb;
- row0[1] = rgb;
- row1[0] = rgb;
- row1[1] = rgb;
- row0 += 2;
- row1 += 2;
- src++;
- csx++;
- cdx += 2;
- }
-
- // Copy the pixels.
- if (overlay)
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- p &= ~0x03030303;
- p >>= 2;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- row0[0] = rgb;
- row0[1] = rgb;
- row1[0] = rgb;
- row1[1] = rgb;
- row0 += 2;
- row1 += 2;
- src++;
- csx++;
- cdx += 2;
- }
- }
- else
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- row0[0] = rgb;
- row0[1] = rgb;
- row1[0] = rgb;
- row1[1] = rgb;
- row0 += 2;
- row1 += 2;
- src++;
- csx++;
- cdx += 2;
- }
- }
-
- // Fill any portion to the right of src with background pixels.
- while (cdx < dest_w)
- {
- unsigned int rgb = 0;
- row0[0] = rgb;
- row0[1] = rgb;
- row1[0] = rgb;
- row1[1] = rgb;
- row0 += 2;
- row1 += 2;
- src++;
- csx++;
- cdx += 2;
- }
- }
+ *dst = src & 0xffffff;
+ }
- csy++;
- }
+ template <typename pixel_t> inline
+ void fill_pixel(pixel_t **rows, int scale, pixel_t value)
+ {
+ for (int y = scale; y--;)
+ for (int x = scale; x--;)
+ *rows[y]++ = value;
}
- void blit_4x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ template <typename pixel_t>
+ void blit(GdkImage *img, int src_x, int src_y, int dest_x,
+ int dest_y, int dest_w, int dest_h, bool overlay, int scale)
{
- unsigned short* pixels = (unsigned short*)img->mem;
- int pitch = img->bpl/sizeof(unsigned short);
+ pixel_t *pixels = (pixel_t*)img->mem;
+ int pitch = img->bpl/sizeof(pixel_t);
// Clip rectangle.
// Clip destination rectangle. Source clipping is handled per pixel.
@@ -1286,31 +1087,25 @@ public:
dest_h += dest_y;
dest_y = 0;
}
- if (dest_x + dest_w > img->width-4)
- dest_w = (img->width-4) - dest_x;
- if (dest_y + dest_h > img->height-4)
- dest_h = (img->height-4) - dest_y;
+ if (dest_x + dest_w > img->width-scale)
+ dest_w = (img->width-scale) - dest_x;
+ if (dest_y + dest_h > img->height-scale)
+ dest_h = (img->height-scale) - dest_y;
int csy = src_y;
- for (int cdy = dest_y; cdy < dest_y+dest_h; cdy += 4)
+ for (int cdy = dest_y; cdy < dest_y+dest_h; cdy += scale)
{
- unsigned short* __restrict row0 = &pixels[cdy*pitch+dest_x];
- unsigned short* __restrict row1 = row0 + pitch;
- unsigned short* __restrict row2 = row1 + pitch;
- unsigned short* __restrict row3 = row2 + pitch;
-
-#define FILL_PIXEL(rgb) \
- row0[0] = rgb; row0[1] = rgb; row0[2] = rgb; row0[3] = rgb; \
- row1[0] = rgb; row1[1] = rgb; row1[2] = rgb; row1[3] = rgb; \
- row2[0] = rgb; row2[1] = rgb; row2[2] = rgb; row2[3] = rgb; \
- row3[0] = rgb; row3[1] = rgb; row3[2] = rgb; row3[3] = rgb; \
- row0 += 4; row1 += 4; row2 += 4; row3 += 4;
+ pixel_t* __restrict rows[scale];
+
+ rows[0] = &pixels[cdy*pitch+dest_x];
+ for (int i = 1; i < scale; ++i) rows[i] = rows[i-1] + pitch;
if (csy < 0 || csy >= height)
{
- for (int cdx = 0; cdx < dest_w; cdx += 4)
+ for (int cdx = 0; cdx < dest_w; cdx += scale)
{
- FILL_PIXEL(0)
+ pixel_t p = 0;
+ fill_pixel((pixel_t**)rows, scale, p);
}
}
else
@@ -1322,11 +1117,11 @@ public:
while (csx < 0 && cdx < dest_w)
{
- FILL_PIXEL(0)
-
+ pixel_t p = 0;
+ fill_pixel((pixel_t**)rows, scale, p);
src++;
csx++;
- cdx += 4;
+ cdx += scale;
}
if (overlay)
@@ -1336,168 +1131,71 @@ public:
unsigned int p = *src;
p &= ~0x03030303;
p >>= 2;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- FILL_PIXEL(rgb)
-
+ pixel_t rgb;
+ to_pixel(p, &rgb);
+ fill_pixel((pixel_t**)rows, scale, rgb);
src++;
csx++;
- cdx += 4;
+ cdx += scale;
}
}
else
{
while (csx < width && cdx < dest_w)
{
- unsigned int p = *src;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- FILL_PIXEL(rgb)
-
+ pixel_t rgb;
+ to_pixel(*src, &rgb);
+ fill_pixel((pixel_t**)rows, scale, rgb);
src++;
csx++;
- cdx += 4;
+ cdx += scale;
}
}
while (cdx < dest_w)
{
- FILL_PIXEL(0)
-
+ pixel_t p = 0;
+ fill_pixel((pixel_t**)rows, scale, p);
src++;
csx++;
- cdx += 4;
+ cdx += scale;
}
}
-#undef FILL_PIXEL
-
csy++;
}
}
-
- void blit_8x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
- {
- unsigned short* pixels = (unsigned short*)img->mem;
- int pitch = img->bpl/sizeof(unsigned short);
-
- // Clip rectangle.
- // Clip destination rectangle. Source clipping is handled per pixel.
- if (dest_x < 0)
- {
- dest_w += dest_x;
- dest_x = 0;
- }
- if (dest_y < 0)
- {
- dest_h += dest_y;
- dest_y = 0;
- }
- if (dest_x + dest_w > img->width-8)
- dest_w = (img->width-8) - dest_x;
- if (dest_y + dest_h > img->height-8)
- dest_h = (img->height-8) - dest_y;
- int csy = src_y;
- for (int cdy = dest_y; cdy < dest_y+dest_h; cdy += 8)
- {
- unsigned short* __restrict row0 = &pixels[cdy*pitch+dest_x];
- unsigned short* __restrict row1 = row0 + pitch;
- unsigned short* __restrict row2 = row1 + pitch;
- unsigned short* __restrict row3 = row2 + pitch;
- unsigned short* __restrict row4 = row3 + pitch;
- unsigned short* __restrict row5 = row4 + pitch;
- unsigned short* __restrict row6 = row5 + pitch;
- unsigned short* __restrict row7 = row6 + pitch;
-
-#define FILL_PIXEL(rgb) \
- row0[0] = rgb; row0[1] = rgb; row0[2] = rgb; row0[3] = rgb; row0[4] = rgb; row0[5] = rgb; row0[6] = rgb; row0[7] = rgb; \
- row1[0] = rgb; row1[1] = rgb; row1[2] = rgb; row1[3] = rgb; row1[4] = rgb; row1[5] = rgb; row1[6] = rgb; row1[7] = rgb; \
- row2[0] = rgb; row2[1] = rgb; row2[2] = rgb; row2[3] = rgb; row2[4] = rgb; row2[5] = rgb; row2[6] = rgb; row2[7] = rgb; \
- row3[0] = rgb; row3[1] = rgb; row3[2] = rgb; row3[3] = rgb; row3[4] = rgb; row3[5] = rgb; row3[6] = rgb; row3[7] = rgb; \
- row4[0] = rgb; row4[1] = rgb; row4[2] = rgb; row4[3] = rgb; row4[4] = rgb; row4[5] = rgb; row4[6] = rgb; row4[7] = rgb; \
- row5[0] = rgb; row5[1] = rgb; row5[2] = rgb; row5[3] = rgb; row5[4] = rgb; row5[5] = rgb; row5[6] = rgb; row5[7] = rgb; \
- row6[0] = rgb; row6[1] = rgb; row6[2] = rgb; row6[3] = rgb; row6[4] = rgb; row6[5] = rgb; row6[6] = rgb; row6[7] = rgb; \
- row7[0] = rgb; row7[1] = rgb; row7[2] = rgb; row7[3] = rgb; row7[4] = rgb; row7[5] = rgb; row7[6] = rgb; row7[7] = rgb; \
- row0 += 8; row1 += 8; row2 += 8; row3 += 8; row4 += 8; row5 += 8; row6 += 8; row7 += 8;
-
- if (csy < 0 || csy >= height)
- {
- for (int cdx = 0; cdx < dest_w; cdx += 8)
- {
- FILL_PIXEL(0)
- }
- }
- else
- {
- unsigned int* __restrict src = &image[csy*width+src_x];
-
- int cdx = 0;
- int csx = src_x;
+ inline
+ void blit_x(GdkImage *img, int src_x, int src_y, int dest_x, int dest_y,
+ int dest_w, int dest_h, bool overlay, int scale)
+ {
+ if (img->depth == 16)
+ blit<depth16_t>(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h,
+ overlay, scale);
+ else
+ blit<depth24_t>(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h,
+ overlay, scale);
+ }
- while (csx < 0 && cdx < dest_w)
- {
- FILL_PIXEL(0)
-
- src++;
- csx++;
- cdx += 8;
- }
-
- if (overlay)
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- p &= ~0x03030303;
- p >>= 2;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- FILL_PIXEL(rgb)
-
- src++;
- csx++;
- cdx += 8;
- }
- }
- else
- {
- while (csx < width && cdx < dest_w)
- {
- unsigned int p = *src;
- unsigned int r = (((p>>16)&0xff)>>3)<<11;
- unsigned int g = (((p>> 8)&0xff)>>2)<<5;
- unsigned int b = (((p>> 0)&0xff)>>3);
- unsigned int rgb = r|g|b;
- FILL_PIXEL(rgb)
-
- src++;
- csx++;
- cdx += 8;
- }
- }
-
- while (cdx < dest_w)
- {
- unsigned int rgb = 0;
- FILL_PIXEL(rgb)
-
- src++;
- csx++;
- cdx += 8;
- }
- }
+ void blit_1x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ {
+ blit_x(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h, overlay, 1);
+ }
-#undef FILL_PIXEL
+ void blit_2x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ {
+ blit_x(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h, overlay, 2);
+ }
- csy++;
- }
+ void blit_4x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ {
+ blit_x(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h, overlay, 4);
+ }
+
+ void blit_8x(GdkImage* img, int src_x, int src_y, int dest_x, int dest_y, int dest_w, int dest_h, bool overlay)
+ {
+ blit_x(img, src_x, src_y, dest_x, dest_y, dest_w, dest_h, overlay, 8);
}
//---------------------------------------------------------------------------------------------
diff --git a/colorsc/colorsc.h b/colorsc/colorsc.h
index 543a2ce..2e4c372 100644
--- a/colorsc/colorsc.h
+++ b/colorsc/colorsc.h
@@ -27,9 +27,6 @@ using namespace std;
#include <cmath>
#include <float.h>
-// todo- Include the real GTK headers when installed.
-#include "gtk_types.h"
-
static const float PI = 3.14159f;
inline float sgn(float a) { if (a>0) return 1; if (a<0) return -1; return 0; }
diff --git a/colorsc/colorsc.i b/colorsc/colorsc.i
index a1e3471..47c96ec 100644
--- a/colorsc/colorsc.i
+++ b/colorsc/colorsc.i
@@ -18,6 +18,8 @@
%module colorsc
%{
+#include <pygobject.h>
+
#include "canvas.h"
#include "palette.h"
%}
diff --git a/colorsc/gtk_types.h b/colorsc/gtk_types.h
deleted file mode 100644
index f3e26bd..0000000
--- a/colorsc/gtk_types.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// This file serves to allow access to a limited subset of GTK and GStreamer objects passed from PyGTK, without the full
-// GLib + GTK + GST development environment.
-//
-// Obviously, it is limited to working with a specific version of GTK, PyGTK and GStreamer, but these structures appear
-// to be fairly stable.
-#ifndef GTK_TYPES_H
-#define GTK_TYPES_H
-
-#include <stdint.h>
-
-typedef uint8_t guint8;
-typedef int32_t gint;
-typedef uint32_t guint;
-typedef uint16_t guint16;
-typedef uint64_t guint64;
-typedef void* gpointer;
-
-struct GTypeClass;
-struct GData;
-
-struct _GTypeInstance
-{
- /*< private >*/
- GTypeClass *g_class;
-};
-
-typedef struct _GTypeInstance GTypeInstance;
-
-struct _GObject
-{
- GTypeInstance g_type_instance;
-
- /*< private >*/
- guint ref_count;
- GData *qdata;
-};
-
-typedef struct _GObject GObject;
-
-typedef enum
-{
- GDK_IMAGE_NORMAL,
- GDK_IMAGE_SHARED,
- GDK_IMAGE_FASTEST
-} GdkImageType;
-
-typedef enum
-{
- GDK_LSB_FIRST,
- GDK_MSB_FIRST
-} GdkByteOrder;
-
-struct GdkVisual;
-struct GdkColormap;
-
-typedef struct {
- GObject parent_instance;
-
-
- GdkImageType type; /* read only. */
- GdkVisual *visual; /* read only. visual used to create the image */
- GdkByteOrder byte_order; /* read only. */
- gint width; /* read only. */
- gint height; /* read only. */
- guint16 depth; /* read only. */
- guint16 bpp; /* read only. bytes per pixel */
- guint16 bpl; /* read only. bytes per line */
- guint16 bits_per_pixel; /* read only. bits per pixel */
- gpointer mem;
-
- GdkColormap *colormap; /* read only. */
-} GdkImage;
-
-struct GSList;
-
-typedef struct {
- PyObject_HEAD
- GObject *obj;
- PyObject *inst_dict; /* the instance dictionary -- must be last */
- PyObject *weakreflist; /* list of weak references */
- GSList *closures;
-} PyGObject;
-
-struct _GstMiniObject {
- GTypeInstance instance;
- /*< public >*/ /* with COW */
- gint refcount;
- guint flags;
-
- /*< private >*/
- gpointer _gst_reserved;
-};
-
-typedef struct _GstMiniObject GstMiniObject;
-
-struct GstCaps;
-
-typedef guint64 GstClockTime;
-
-#define GST_PADDING 4
-
-struct _GstBuffer {
- GstMiniObject mini_object;
-
- /*< public >*/ /* with COW */
- /* pointer to data and its size */
- guint8 *data;
- guint size;
-
- /* timestamp */
- GstClockTime timestamp;
- GstClockTime duration;
-
- /* the media type of this buffer */
- GstCaps *caps;
-
- /* media specific offset */
- guint64 offset;
- guint64 offset_end;
-
- guint8 *malloc_data;
-
- /*< private >*/
- gpointer _gst_reserved[GST_PADDING];
-};
-
-typedef struct _GstBuffer GstBuffer;
-
-#endif
-
diff --git a/colorsc/setup.py b/colorsc/setup.py
deleted file mode 100644
index 1295652..0000000
--- a/colorsc/setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-"""
-setup.py file for colorsc
-"""
-
-from distutils.core import setup, Extension
-
-colorsc_module = Extension('_colorsc', sources=['canvas.cpp', 'palette.cpp', 'colorsc_wrap.cxx'] )
-
-setup (name = 'colorsc', version = '0.1',
- author = "Jens Andersson",
- description = """Colors C extension library.""",
- ext_modules = [colorsc_module], py_modules = ["colorsc"])
-