From 6a9475464c514ca0535bcd5ca262db3c2e35ca47 Mon Sep 17 00:00:00 2001
From: sam <sam@92316355-f0b4-4df1-b90c-862c8a59935f>
Date: Sat, 23 Aug 2008 13:07:30 +0000
Subject: [PATCH]   * Do not prefix stock image names with "pipi:", it's
 redundant.

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2757 92316355-f0b4-4df1-b90c-862c8a59935f
---
 pipi/codec.c |  5 +++--
 pipi/stock.c | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pipi/codec.c b/pipi/codec.c
index a2e8f03..26ae428 100644
--- a/pipi/codec.c
+++ b/pipi/codec.c
@@ -28,8 +28,9 @@
 
 pipi_image_t *pipi_load(char const *name)
 {
-    if(!strncmp(name, "pipi:", 5))
-        return pipi_load_stock(name + 5);
+    if(!strncmp(name, "random:", 7) ||
+       !strncmp(name, "bayer:", 6))
+        return pipi_load_stock(name);
 
 #if USE_IMLIB2
     return pipi_load_imlib2(name);
diff --git a/pipi/stock.c b/pipi/stock.c
index a25ebe2..697bf41 100644
--- a/pipi/stock.c
+++ b/pipi/stock.c
@@ -33,12 +33,12 @@ pipi_image_t *pipi_load_stock(char const *name)
     float *data;
 
     /* Generate a Bayer dithering pattern. */
-    if(!strncmp(name, "bayer", 5))
+    if(!strncmp(name, "bayer:", 6))
     {
         int i, j, w, h, n;
 
-        w = atoi(name + 5);
-        name = strchr(name + 5, 'x');
+        w = atoi(name + 6);
+        name = strchr(name + 6, 'x');
         if(!name)
             return NULL;
         h = atoi(name + 1);
@@ -74,13 +74,13 @@ pipi_image_t *pipi_load_stock(char const *name)
     }
 
     /* Generate a completely random image. */
-    if(!strncmp(name, "random", 6))
+    if(!strncmp(name, "random:", 7))
     {
         unsigned int ctx = 1;
         int x, y, t, w, h;
 
-        w = atoi(name + 6);
-        name = strchr(name + 6, 'x');
+        w = atoi(name + 7);
+        name = strchr(name + 7, 'x');
         if(!name)
             return NULL;
         h = atoi(name + 1);