Image

.travis.yml

@@ -11,6 +11,8 @@ env:
   global:
     - SYMPY_SRC=sympy-1.0
     - DOC="false"
+    - NUMPY="false"
+    - SKIMAGE="false"
   matrix:
     - CYTHON="false"
     - CYTHON="true"
@@ -25,6 +27,10 @@ matrix:
       env: SYMPY_SRC=master CYTHON="false"
     - python: 3.5
       env: SYMPY_SRC=master CYTHON="false"
+    - python: 2.7
+      env: NUMPY="true" SKIMAGE="true"
+    - python: 3.5
+      env: NUMPY="true" SKIMAGE="true"
   exclude:
     # PyPy is not compatible with Cython
     - python: pypy
@@ -46,6 +52,13 @@ before_install:
   - if [[ "$CYTHON" == "true" ]]; then
       pip install cython;
     fi
+  - if [[ "$NUMPY" == "true" ]]; then
+      sudo apt-get update -qq &&
+      sudo apt-get install -qq python-numpy;
+    fi
+  - if [[ "$SKIMAGE" == "true" ]]; then
+      pip install scikit-image;
+    fi
   - pip install unittest2
   - pip install pexpect
   - pip install git+https://github.com/sympy/sympy.git@$SYMPY_SRC

mathics/autoload/formats/Image/Export.m

@@ -0,0 +1,14 @@
+(* Image Exporter *)
+
+Begin["System`Convert`Image`"]
+
+RegisterImageExport[type_] := RegisterExport[
+    type,
+	System`ImageExport,
+	Options -> {},
+	BinaryFormat -> True
+];
+
+RegisterImageExport[#]& /@ {"BMP", "GIF", "JPEG2000", "JPEG", "PCX", "PNG", "PPM", "PBM", "PGM", "TIFF"};
+
+End[]

mathics/autoload/formats/Image/Import.m

@@ -0,0 +1,16 @@
+(* Image Importer *)
+
+Begin["System`Convert`Image`"]
+
+RegisterImageImport[type_] := RegisterImport[
+    type,
+    System`ImageImport,
+    {},
+    AvailableElements -> {"Image"},
+    DefaultElement -> "Image",
+    FunctionChannels -> {"FileNames"}
+];
+
+RegisterImageImport[#]& /@ {"BMP", "GIF", "JPEG2000", "JPEG", "PCX", "PNG", "PPM", "PBM", "PGM", "TIFF", "ICO", "TGA"};
+
+End[]

mathics/builtin/__init__.py

@@ -27,6 +27,10 @@
     from mathics.builtin import files, importexport
     modules += [files, importexport]
 
+from mathics.builtin import image
+if image._enabled:
+    modules.append(image)
+
 builtins = []
 builtins_by_module = {}
 

mathics/builtin/base.py

@@ -145,11 +145,13 @@ def contextify_form_name(f):
             makeboxes_def.add_rule(rule)
 
     @classmethod
-    def get_name(cls):
+    def get_name(cls, short=False):
         if cls.name is None:
             shortname = cls.__name__
         else:
             shortname = cls.name
+        if short:
+            return shortname
         return cls.context + shortname
 
     def get_operator(self):
@@ -215,6 +217,16 @@ def init(self, *args, **kwargs):
         pass
 
 
+class AtomBuiltin(Builtin):
+    # allows us to define apply functions, rules, messages, etc. for Atoms
+    # which are by default not in the definitions' contribution pipeline.
+    # see Image[] for an example of this.
+
+    def get_name(self):
+        name = super(AtomBuiltin, self).get_name()
+        return re.sub(r"Atom$", "", name)
+
+
 class Operator(Builtin):
     operator = None
     precedence = None