indie-raster 0.0.6 → 0.0.7

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 fonts/scripts/temp
 build-c
+*.gem

data/indie-raster.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
 
   s.name        = "indie-raster"
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
 
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["ShopKeep"]

data/make.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+mkdir -p build-c
+
 gcc \
   -O2 \
   -o build-c/indie-raster \

data/src-c/canvas.c

@@ -60,6 +60,11 @@ void Canvas_writeP4(Canvas *c, FILE *f) {
 }
 
 
+void Canvas_writeP6(Canvas *c, FILE *f) {
+  Canvas_writeSubrectP6(c, f, 0, 0, c->w, c->h);
+}
+
+
 void Canvas_writeSubrectP4(Canvas *c, FILE *f, long x, long y, long w, long h) {
   if (c->bpp == 1) {
     fprintf(f, "P4\n%ld %ld\n", w, h);
@@ -71,6 +76,29 @@ void Canvas_writeSubrectP4(Canvas *c, FILE *f, long x, long y, long w, long h) {
 }
 
 
+void Canvas_writeSubrectP6(Canvas *c, FILE *f, long x0, long y0, long w, long h) {
+  long pos, x, y;
+  if (c->bpp == 1) {
+    fprintf(f, "P6\n%ld %ld\n255\n", w, h);
+    for (y = y0; y < (h + y0); y++) {
+      if (y < c->h) {
+        for (x = x0; x < (w + x0); x++) {
+          if (y < c->h) {
+            pos = (y * (c->w)) + x;
+            fputc(c->pixels[pos], f);
+            fputc(c->pixels[pos], f);
+            fputc(c->pixels[pos], f);
+          }
+        }
+      }
+    }
+  }
+  else {
+    // HANDLE
+  }
+}
+
+
 void Canvas_drawOnto(Canvas *src, Canvas *dest, long x0, long y0) {
   
   long n;

data/src-c/canvas.h

@@ -23,7 +23,9 @@ Canvas* Canvas_readImage(FILE *f);
 
 void Canvas_free(Canvas **c);
 void Canvas_writeP4(Canvas *c, FILE *f);
+void Canvas_writeP6(Canvas *c, FILE *f);
 void Canvas_writeSubrectP4(Canvas *c, FILE *f, long x, long y, long w, long h);
+void Canvas_writeSubrectP6(Canvas *c, FILE *f, long x, long y, long w, long h);
 void Canvas_drawOnto(Canvas *src, Canvas *dest, long x0, long y0);
 
 #endif

data/src-c/commands.c

@@ -28,6 +28,10 @@ void run_commands(Session *s, FILE *f, FILE *outfile) {
       long srcId = atol(strtok(NULL, " \t\n"));
       exportP4(s, srcId, outfile);
     }
+    else if (strcmp(tok, "exportP6") == 0) {
+      long srcId = atol(strtok(NULL, " \t\n"));
+      exportP6(s, srcId, outfile);
+    }
     else if (strcmp(tok, "loadImage") == 0) {
       long destId = atol(strtok(NULL, " \t\n"));
       long size = atol(strtok(NULL, " \t\n"));
@@ -79,6 +83,12 @@ void exportP4(Session *s, long srcId, FILE *outfile) {
 }
 
 
+void exportP6(Session *s, long srcId, FILE *outfile) {
+  Canvas *c = Session_getCanvas(s, srcId);
+  Canvas_writeP6(c, outfile);
+}
+
+
 void loadImage(Session *s, long destId, long size, FILE *f) {
   Canvas *c = Canvas_readImage(f);
   Session_setCanvas(s, destId, c);

data/src-c/commands.h

@@ -17,6 +17,7 @@
 void run_commands(Session *s, FILE *f, FILE *outfile);
 void createBlank(Session *s, long destId, long w, long h);
 void exportP4(Session *s, long srcId, FILE *outfile);
+void exportP6(Session *s, long srcId, FILE *outfile);
 void loadImage(Session *s, long destId, long size, FILE *f);
 void loadFont(Session *s, long destId, long size, FILE *f);
 void drawText(Session *s, long destId, long x, long y, long fontId, long numChars, FILE *f);

data/src-ruby/indie-raster.rb

@@ -81,10 +81,16 @@ class IndieRasterSession
   end
 
   def exportP4(opt = {})
+    export 'exportP4', opt
+  end
+
+  def exportP6(opt = {})
+    export 'exportP6', opt
+  end
 
-    @c.push "exportP4 #{opt[:id] or 1}\n"
+  def export(command, opt)
 
-    input = @c.join ''
+    input = @c.join('') + "#{command} #{opt[:id] or 1}\n"
 
     tmppath = opt[:commands_temp_path]
     if tmppath