From 57bcd3a0394b56f0680871e4b4fc0164b37d3a14 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 27 Aug 2011 17:25:15 -0700 Subject: [PATCH 1/3] images: move pure Factor image format implementations to extra/ --- {basis => extra}/images/bitmap/authors.txt | 0 {basis => extra}/images/bitmap/bitmap-tests.factor | 0 {basis => extra}/images/bitmap/bitmap.factor | 0 {basis => extra}/images/bitmap/summary.txt | 0 {basis => extra}/images/jpeg/jpeg.factor | 0 {basis => extra}/images/pbm/authors.txt | 0 {basis => extra}/images/pbm/pbm-tests.factor | 0 {basis => extra}/images/pbm/pbm.factor | 0 {basis => extra}/images/pbm/summary.txt | 0 {basis => extra}/images/pgm/authors.txt | 0 {basis => extra}/images/pgm/pgm-tests.factor | 0 {basis => extra}/images/pgm/pgm.factor | 0 {basis => extra}/images/pgm/summary.txt | 0 {basis => extra}/images/png/authors.txt | 0 {basis => extra}/images/png/png-tests.factor | 0 {basis => extra}/images/png/png.factor | 0 {basis => extra}/images/ppm/authors.txt | 0 {basis => extra}/images/ppm/ppm-tests.factor | 0 {basis => extra}/images/ppm/ppm.factor | 0 {basis => extra}/images/ppm/summary.txt | 0 {basis => extra}/images/tga/authors.txt | 0 {basis => extra}/images/tga/tga.factor | 0 {basis => extra}/images/tiff/authors.txt | 0 {basis => extra}/images/tiff/summary.txt | 0 {basis => extra}/images/tiff/tiff-tests.factor | 0 {basis => extra}/images/tiff/tiff.factor | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename {basis => extra}/images/bitmap/authors.txt (100%) rename {basis => extra}/images/bitmap/bitmap-tests.factor (100%) rename {basis => extra}/images/bitmap/bitmap.factor (100%) rename {basis => extra}/images/bitmap/summary.txt (100%) rename {basis => extra}/images/jpeg/jpeg.factor (100%) rename {basis => extra}/images/pbm/authors.txt (100%) rename {basis => extra}/images/pbm/pbm-tests.factor (100%) rename {basis => extra}/images/pbm/pbm.factor (100%) rename {basis => extra}/images/pbm/summary.txt (100%) rename {basis => extra}/images/pgm/authors.txt (100%) rename {basis => extra}/images/pgm/pgm-tests.factor (100%) rename {basis => extra}/images/pgm/pgm.factor (100%) rename {basis => extra}/images/pgm/summary.txt (100%) rename {basis => extra}/images/png/authors.txt (100%) rename {basis => extra}/images/png/png-tests.factor (100%) rename {basis => extra}/images/png/png.factor (100%) rename {basis => extra}/images/ppm/authors.txt (100%) rename {basis => extra}/images/ppm/ppm-tests.factor (100%) rename {basis => extra}/images/ppm/ppm.factor (100%) rename {basis => extra}/images/ppm/summary.txt (100%) rename {basis => extra}/images/tga/authors.txt (100%) rename {basis => extra}/images/tga/tga.factor (100%) rename {basis => extra}/images/tiff/authors.txt (100%) rename {basis => extra}/images/tiff/summary.txt (100%) rename {basis => extra}/images/tiff/tiff-tests.factor (100%) rename {basis => extra}/images/tiff/tiff.factor (100%) diff --git a/basis/images/bitmap/authors.txt b/extra/images/bitmap/authors.txt similarity index 100% rename from basis/images/bitmap/authors.txt rename to extra/images/bitmap/authors.txt diff --git a/basis/images/bitmap/bitmap-tests.factor b/extra/images/bitmap/bitmap-tests.factor similarity index 100% rename from basis/images/bitmap/bitmap-tests.factor rename to extra/images/bitmap/bitmap-tests.factor diff --git a/basis/images/bitmap/bitmap.factor b/extra/images/bitmap/bitmap.factor similarity index 100% rename from basis/images/bitmap/bitmap.factor rename to extra/images/bitmap/bitmap.factor diff --git a/basis/images/bitmap/summary.txt b/extra/images/bitmap/summary.txt similarity index 100% rename from basis/images/bitmap/summary.txt rename to extra/images/bitmap/summary.txt diff --git a/basis/images/jpeg/jpeg.factor b/extra/images/jpeg/jpeg.factor similarity index 100% rename from basis/images/jpeg/jpeg.factor rename to extra/images/jpeg/jpeg.factor diff --git a/basis/images/pbm/authors.txt b/extra/images/pbm/authors.txt similarity index 100% rename from basis/images/pbm/authors.txt rename to extra/images/pbm/authors.txt diff --git a/basis/images/pbm/pbm-tests.factor b/extra/images/pbm/pbm-tests.factor similarity index 100% rename from basis/images/pbm/pbm-tests.factor rename to extra/images/pbm/pbm-tests.factor diff --git a/basis/images/pbm/pbm.factor b/extra/images/pbm/pbm.factor similarity index 100% rename from basis/images/pbm/pbm.factor rename to extra/images/pbm/pbm.factor diff --git a/basis/images/pbm/summary.txt b/extra/images/pbm/summary.txt similarity index 100% rename from basis/images/pbm/summary.txt rename to extra/images/pbm/summary.txt diff --git a/basis/images/pgm/authors.txt b/extra/images/pgm/authors.txt similarity index 100% rename from basis/images/pgm/authors.txt rename to extra/images/pgm/authors.txt diff --git a/basis/images/pgm/pgm-tests.factor b/extra/images/pgm/pgm-tests.factor similarity index 100% rename from basis/images/pgm/pgm-tests.factor rename to extra/images/pgm/pgm-tests.factor diff --git a/basis/images/pgm/pgm.factor b/extra/images/pgm/pgm.factor similarity index 100% rename from basis/images/pgm/pgm.factor rename to extra/images/pgm/pgm.factor diff --git a/basis/images/pgm/summary.txt b/extra/images/pgm/summary.txt similarity index 100% rename from basis/images/pgm/summary.txt rename to extra/images/pgm/summary.txt diff --git a/basis/images/png/authors.txt b/extra/images/png/authors.txt similarity index 100% rename from basis/images/png/authors.txt rename to extra/images/png/authors.txt diff --git a/basis/images/png/png-tests.factor b/extra/images/png/png-tests.factor similarity index 100% rename from basis/images/png/png-tests.factor rename to extra/images/png/png-tests.factor diff --git a/basis/images/png/png.factor b/extra/images/png/png.factor similarity index 100% rename from basis/images/png/png.factor rename to extra/images/png/png.factor diff --git a/basis/images/ppm/authors.txt b/extra/images/ppm/authors.txt similarity index 100% rename from basis/images/ppm/authors.txt rename to extra/images/ppm/authors.txt diff --git a/basis/images/ppm/ppm-tests.factor b/extra/images/ppm/ppm-tests.factor similarity index 100% rename from basis/images/ppm/ppm-tests.factor rename to extra/images/ppm/ppm-tests.factor diff --git a/basis/images/ppm/ppm.factor b/extra/images/ppm/ppm.factor similarity index 100% rename from basis/images/ppm/ppm.factor rename to extra/images/ppm/ppm.factor diff --git a/basis/images/ppm/summary.txt b/extra/images/ppm/summary.txt similarity index 100% rename from basis/images/ppm/summary.txt rename to extra/images/ppm/summary.txt diff --git a/basis/images/tga/authors.txt b/extra/images/tga/authors.txt similarity index 100% rename from basis/images/tga/authors.txt rename to extra/images/tga/authors.txt diff --git a/basis/images/tga/tga.factor b/extra/images/tga/tga.factor similarity index 100% rename from basis/images/tga/tga.factor rename to extra/images/tga/tga.factor diff --git a/basis/images/tiff/authors.txt b/extra/images/tiff/authors.txt similarity index 100% rename from basis/images/tiff/authors.txt rename to extra/images/tiff/authors.txt diff --git a/basis/images/tiff/summary.txt b/extra/images/tiff/summary.txt similarity index 100% rename from basis/images/tiff/summary.txt rename to extra/images/tiff/summary.txt diff --git a/basis/images/tiff/tiff-tests.factor b/extra/images/tiff/tiff-tests.factor similarity index 100% rename from basis/images/tiff/tiff-tests.factor rename to extra/images/tiff/tiff-tests.factor diff --git a/basis/images/tiff/tiff.factor b/extra/images/tiff/tiff.factor similarity index 100% rename from basis/images/tiff/tiff.factor rename to extra/images/tiff/tiff.factor From ba416afd611a7846ac91f6e6334314291cb950c3 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sat, 27 Aug 2011 17:29:10 -0700 Subject: [PATCH 2/3] images.tessel(l)ation: spelling --- basis/images/{tesselation => tessellation}/authors.txt | 0 .../tessellation-tests.factor} | 2 +- .../tesselation.factor => tessellation/tessellation.factor} | 2 +- basis/opengl/textures/textures.factor | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename basis/images/{tesselation => tessellation}/authors.txt (100%) rename basis/images/{tesselation/tesselation-tests.factor => tessellation/tessellation-tests.factor} (98%) rename basis/images/{tesselation/tesselation.factor => tessellation/tessellation.factor} (97%) diff --git a/basis/images/tesselation/authors.txt b/basis/images/tessellation/authors.txt similarity index 100% rename from basis/images/tesselation/authors.txt rename to basis/images/tessellation/authors.txt diff --git a/basis/images/tesselation/tesselation-tests.factor b/basis/images/tessellation/tessellation-tests.factor similarity index 98% rename from basis/images/tesselation/tesselation-tests.factor rename to basis/images/tessellation/tessellation-tests.factor index 5999c15d5c..bfde13f4c4 100644 --- a/basis/images/tesselation/tesselation-tests.factor +++ b/basis/images/tessellation/tessellation-tests.factor @@ -1,6 +1,6 @@ USING: images accessors kernel tools.test literals math.ranges byte-arrays ; -IN: images.tesselation +IN: images.tessellation ! Check an invariant we depend on [ t ] [ diff --git a/basis/images/tesselation/tesselation.factor b/basis/images/tessellation/tessellation.factor similarity index 97% rename from basis/images/tesselation/tesselation.factor rename to basis/images/tessellation/tessellation.factor index d01bad61ea..a37c67b5b4 100644 --- a/basis/images/tesselation/tesselation.factor +++ b/basis/images/tessellation/tessellation.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: sequences kernel math grouping fry columns locals accessors images math.vectors arrays ; -IN: images.tesselation +IN: images.tessellation : group-rows ( bitmap bitmap-dim -- rows ) first ; inline diff --git a/basis/opengl/textures/textures.factor b/basis/opengl/textures/textures.factor index 0aaa9dcf9b..50b0d309a9 100644 --- a/basis/opengl/textures/textures.factor +++ b/basis/opengl/textures/textures.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors alien.data assocs cache colors.constants destructors kernel opengl opengl.gl opengl.capabilities -combinators images images.tesselation grouping sequences math +combinators images images.tessellation grouping sequences math math.vectors generalizations fry arrays namespaces system locals literals specialized-arrays ; FROM: alien.c-types => int float ; From 5a38ddc31c6344ee0fb381249a0321b7c1b82f6e Mon Sep 17 00:00:00 2001 From: sheeple Date: Sat, 27 Aug 2011 18:34:44 -0600 Subject: [PATCH 3/3] graphviz: fix load errors --- extra/graphviz/ffi/ffi.factor | 2 ++ extra/graphviz/render/render.factor | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extra/graphviz/ffi/ffi.factor b/extra/graphviz/ffi/ffi.factor index 50fccf0a1f..794640ab4b 100644 --- a/extra/graphviz/ffi/ffi.factor +++ b/extra/graphviz/ffi/ffi.factor @@ -6,6 +6,7 @@ fry io kernel literals math prettyprint sequences splitting system memoize graphviz ; IN: graphviz.ffi +<< "libgraph" { { [ os macosx? ] [ "libgraph.dylib" ] } { [ os unix? ] [ "libgraph.so" ] } @@ -18,6 +19,7 @@ IN: graphviz.ffi { [ os unix? ] [ "libgvc.so" ] } { [ os winnt? ] [ "gvc.dll" ] } } cond cdecl add-library +>> LIBRARY: libgraph diff --git a/extra/graphviz/render/render.factor b/extra/graphviz/render/render.factor index 76857b1b85..f16278f9a2 100644 --- a/extra/graphviz/render/render.factor +++ b/extra/graphviz/render/render.factor @@ -110,7 +110,7 @@ PRIVATE> : define-graphviz-by-format ( -T -- ) [ dup supported-engines member? [ "-file" append ] when - create-in dup make-inline + "graphviz.render" create dup make-inline ] [ [ graphviz* ] curry ] bi (( graph -O -- ))