From d0258923e84a30fa7c14bd30ec7e9adee0007b29 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Wed, 14 Jan 2015 23:49:37 -0800
Subject: [PATCH] More Java nivision wrapper fixes.

- Fix sliceByteBuffer, getBytes, and putBytes implementations, which had
  functional errors.  Also, getBytes and putBytes now use the ByteBuffer
  get/put byte[] functions, which should improve performance.

- Don't generate wrappers for functions that are not available in the
  shared library.

Change-Id: Iaf45814b34720d3fdcd58adf99ad9c3ff2703bc3
---
 .gitignore                                    |    2 +
 .../src/main/java/com/ni/vision/NIVision.java | 1542 +----------------
 wpilibj/wpilibJavaJNI/lib/NIVisionJNI.cpp     | 1250 -------------
 .../wpilibJavaJNI/nivision/dxattr_funcs.txt   |   21 +
 wpilibj/wpilibJavaJNI/nivision/gen_java.py    |   46 +-
 wpilibj/wpilibJavaJNI/nivision/generateJNI.sh |   12 +-
 6 files changed, 81 insertions(+), 2792 deletions(-)
 create mode 100644 wpilibj/wpilibJavaJNI/nivision/dxattr_funcs.txt

diff --git a/.gitignore b/.gitignore
index 53eac49064..18ed277ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ wpilibj/wpilibJavaJNI/nivision/*.cpp
 wpilibj/wpilibJavaJNI/nivision/*.s
 wpilibj/wpilibJavaJNI/nivision/*_arm.ini
 wpilibj/wpilibJavaJNI/nivision/*.java
+wpilibj/wpilibJavaJNI/nivision/nivision_funcs.txt
+wpilibj/wpilibJavaJNI/nivision/imaqdx_funcs.txt
 
 # Created by the jenkins test script
 test-reports
diff --git a/wpilibj/wpilibJavaDevices/src/main/java/com/ni/vision/NIVision.java b/wpilibj/wpilibJavaDevices/src/main/java/com/ni/vision/NIVision.java
index e0863530f8..dfc46d5fd4 100644
--- a/wpilibj/wpilibJavaDevices/src/main/java/com/ni/vision/NIVision.java
+++ b/wpilibj/wpilibJavaDevices/src/main/java/com/ni/vision/NIVision.java
@@ -51,21 +51,29 @@ public class NIVision {
     }
 
     public static ByteBuffer sliceByteBuffer(ByteBuffer bb, int offset, int size) {
-        ByteBuffer new_bb = bb.duplicate().order(ByteOrder.nativeOrder());
-        new_bb.position(offset);
-        new_bb.limit(size);
+        int pos = bb.position();
+        int lim = bb.limit();
+        bb.position(offset);
+        bb.limit(offset+size);
+        ByteBuffer new_bb = bb.slice().order(ByteOrder.nativeOrder());
+        bb.position(pos);
+        bb.limit(lim);
         return new_bb;
     }
 
     public static ByteBuffer getBytes(ByteBuffer bb, byte[] dst, int offset, int size) {
-        for (int i=offset; i<offset+size; i++)
-            dst[i] = bb.get(i);
+        int pos = bb.position();
+        bb.position(offset);
+        bb.get(dst, 0, size);
+        bb.position(pos);
         return bb;
     }
 
     public static ByteBuffer putBytes(ByteBuffer bb, byte[] src, int offset, int size) {
-        for (int i=offset; i<offset+size; i++)
-            bb.put(i, src[i]);
+        int pos = bb.position();
+        bb.position(offset);
+        bb.put(src, 0, size);
+        bb.position(pos);
         return bb;
     }
 
@@ -19623,128 +19631,6 @@ public class NIVision {
      * Acquisition functions
      */
 
-    public static class CopyFromRingResult {
-        public int imageNumber;
-        public Image val;
-        private CopyFromRingResult(ByteBuffer rv_buf) {
-            imageNumber = rv_buf.getInt(0);
-        }
-    }
-
-    public static CopyFromRingResult imaqCopyFromRing(long sessionID, Image image, int imageToCopy, Rect rect) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqCopyFromRing(sessionID, image == null ? 0 : image.getAddress(), imageToCopy, rv_addr+0, rect.getAddress());
-        CopyFromRingResult rv = new CopyFromRingResult(rv_buf);
-        rv.val = new Image(jn_rv, true);
-        return rv;
-    }
-    private static native long _imaqCopyFromRing(long sessionID, long image, int imageToCopy, long imageNumber, long rect);
-
-    public static Image imaqEasyAcquire(String interfaceName) {
-        ByteBuffer interfaceName_buf = null;
-        if (interfaceName != null) {
-            byte[] interfaceName_bytes;
-            try {
-                interfaceName_bytes = interfaceName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                interfaceName_bytes = new byte[0];
-            }
-            interfaceName_buf = ByteBuffer.allocateDirect(interfaceName_bytes.length+1);
-            putBytes(interfaceName_buf, interfaceName_bytes, 0, interfaceName_bytes.length).put(interfaceName_bytes.length, (byte)0);
-        }
-        long jn_rv = _imaqEasyAcquire(interfaceName == null ? 0 : getByteBufferAddress(interfaceName_buf));
-        
-        return new Image(jn_rv, true);
-    }
-    private static native long _imaqEasyAcquire(long interfaceName);
-
-    public static class ExtractFromRingResult {
-        public int imageNumber;
-        public Image val;
-        private ExtractFromRingResult(ByteBuffer rv_buf) {
-            imageNumber = rv_buf.getInt(0);
-        }
-    }
-
-    public static ExtractFromRingResult imaqExtractFromRing(long sessionID, int imageToExtract) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqExtractFromRing(sessionID, imageToExtract, rv_addr+0);
-        ExtractFromRingResult rv = new ExtractFromRingResult(rv_buf);
-        rv.val = new Image(jn_rv, false);
-        return rv;
-    }
-    private static native long _imaqExtractFromRing(long sessionID, int imageToExtract, long imageNumber);
-
-    public static Image imaqGrab(long sessionID, Image image, int immediate) {
-        
-        long jn_rv = _imaqGrab(sessionID, image == null ? 0 : image.getAddress(), immediate);
-        
-        return new Image(jn_rv, true);
-    }
-    private static native long _imaqGrab(long sessionID, long image, int immediate);
-
-    public static void imaqReleaseImage(long sessionID) {
-        
-        _imaqReleaseImage(sessionID);
-        
-    }
-    private static native void _imaqReleaseImage(long sessionID);
-
-    public static void imaqSetupGrab(long sessionID, Rect rect) {
-        
-        _imaqSetupGrab(sessionID, rect.getAddress());
-        
-    }
-    private static native void _imaqSetupGrab(long sessionID, long rect);
-
-    public static void imaqSetupRing(long sessionID, Image[] images, int skipCount, Rect rect) {
-        int numImages = images.length;
-        ByteBuffer images_buf = null;
-        images_buf = ByteBuffer.allocateDirect(images.length*4).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<images.length; i++, off += 4) {
-            putPointer(images_buf, off, images[i]);
-        }
-        _imaqSetupRing(sessionID, getByteBufferAddress(images_buf), numImages, skipCount, rect.getAddress());
-        
-    }
-    private static native void _imaqSetupRing(long sessionID, long images, int numImages, int skipCount, long rect);
-
-    public static void imaqSetupSequence(long sessionID, Image[] images, int skipCount, Rect rect) {
-        int numImages = images.length;
-        ByteBuffer images_buf = null;
-        images_buf = ByteBuffer.allocateDirect(images.length*4).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<images.length; i++, off += 4) {
-            putPointer(images_buf, off, images[i]);
-        }
-        _imaqSetupSequence(sessionID, getByteBufferAddress(images_buf), numImages, skipCount, rect.getAddress());
-        
-    }
-    private static native void _imaqSetupSequence(long sessionID, long images, int numImages, int skipCount, long rect);
-
-    public static Image imaqSnap(long sessionID, Image image, Rect rect) {
-        
-        long jn_rv = _imaqSnap(sessionID, image == null ? 0 : image.getAddress(), rect.getAddress());
-        
-        return new Image(jn_rv, true);
-    }
-    private static native long _imaqSnap(long sessionID, long image, long rect);
-
-    public static void imaqStartAcquisition(long sessionID) {
-        
-        _imaqStartAcquisition(sessionID);
-        
-    }
-    private static native void _imaqStartAcquisition(long sessionID);
-
-    public static void imaqStopAcquisition(long sessionID) {
-        
-        _imaqStopAcquisition(sessionID);
-        
-    }
-    private static native void _imaqStopAcquisition(long sessionID);
-
     /**
      * Arithmetic functions
      */
@@ -20170,27 +20056,6 @@ public class NIVision {
     }
     private static native void _imaqDrawShapeOnImage(long dest, long source, long rect, int mode, int shape, float newPixelValue);
 
-    public static int imaqDrawTextOnImage(Image dest, Image source, Point coord, String text, DrawTextOptions options) {
-        ByteBuffer text_buf = null;
-        if (text != null) {
-            byte[] text_bytes;
-            try {
-                text_bytes = text.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                text_bytes = new byte[0];
-            }
-            text_buf = ByteBuffer.allocateDirect(text_bytes.length+1);
-            putBytes(text_buf, text_bytes, 0, text_bytes.length).put(text_bytes.length, (byte)0);
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqDrawTextOnImage(dest.getAddress(), source.getAddress(), coord.getAddress(), text == null ? 0 : getByteBufferAddress(text_buf), options == null ? 0 : options.getAddress(), rv_addr+0);
-        int fontNameUsed;
-        fontNameUsed = rv_buf.getInt(0);
-        return fontNameUsed;
-    }
-    private static native void _imaqDrawTextOnImage(long dest, long source, long coord, long text, long options, long fontNameUsed);
-
     /**
      * Interlacing functions
      */
@@ -20438,75 +20303,6 @@ public class NIVision {
      * Display functions
      */
 
-    public static int imaqAreToolsContextSensitive() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqAreToolsContextSensitive(rv_addr+0);
-        int sensitive;
-        sensitive = rv_buf.getInt(0);
-        return sensitive;
-    }
-    private static native void _imaqAreToolsContextSensitive(long sensitive);
-
-    public static void imaqCloseWindow(int windowNumber) {
-        
-        _imaqCloseWindow(windowNumber);
-        
-    }
-    private static native void _imaqCloseWindow(int windowNumber);
-
-    public static void imaqDisplayImage(Image image, int windowNumber, int resize) {
-        
-        _imaqDisplayImage(image.getAddress(), windowNumber, resize);
-        
-    }
-    private static native void _imaqDisplayImage(long image, int windowNumber, int resize);
-
-    public static class GetLastKeyResult {
-        public byte keyPressed;
-        public int windowNumber;
-        public int modifiers;
-        private GetLastKeyResult(ByteBuffer rv_buf) {
-            keyPressed = rv_buf.get(0);
-            windowNumber = rv_buf.getInt(8);
-            modifiers = rv_buf.getInt(16);
-        }
-    }
-
-    public static GetLastKeyResult imaqGetLastKey() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetLastKey(rv_addr+0, rv_addr+8, rv_addr+16);
-        GetLastKeyResult rv = new GetLastKeyResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetLastKey(long keyPressed, long windowNumber, long modifiers);
-
-    public static Point imaqGetWindowCenterPos(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowCenterPos(windowNumber, rv_addr+0);
-        Point centerPosition;
-        centerPosition = new Point(rv_buf, 0);
-        centerPosition.read();
-        return centerPosition;
-    }
-    private static native void _imaqGetWindowCenterPos(int windowNumber, long centerPosition);
-
-    public static void imaqSetToolContextSensitivity(int sensitive) {
-        
-        _imaqSetToolContextSensitivity(sensitive);
-        
-    }
-    private static native void _imaqSetToolContextSensitivity(int sensitive);
-
-    public static void imaqShowWindow(int windowNumber, int visible) {
-        
-        _imaqShowWindow(windowNumber, visible);
-        
-    }
-    private static native void _imaqShowWindow(int windowNumber, int visible);
-
     /**
      * Image Manipulation functions
      */
@@ -20597,53 +20393,6 @@ public class NIVision {
      * File I/O functions
      */
 
-    public static void imaqCloseAVI(int session) {
-        
-        _imaqCloseAVI(session);
-        
-    }
-    private static native void _imaqCloseAVI(int session);
-
-    public static int imaqCreateAVI(String fileName, String compressionFilter, int quality, int framesPerSecond, int maxDataSize) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        ByteBuffer compressionFilter_buf = null;
-        if (compressionFilter != null) {
-            byte[] compressionFilter_bytes;
-            try {
-                compressionFilter_bytes = compressionFilter.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                compressionFilter_bytes = new byte[0];
-            }
-            compressionFilter_buf = ByteBuffer.allocateDirect(compressionFilter_bytes.length+1);
-            putBytes(compressionFilter_buf, compressionFilter_bytes, 0, compressionFilter_bytes.length).put(compressionFilter_bytes.length, (byte)0);
-        }
-        int jn_rv = _imaqCreateAVI(fileName == null ? 0 : getByteBufferAddress(fileName_buf), compressionFilter == null ? 0 : getByteBufferAddress(compressionFilter_buf), quality, framesPerSecond, maxDataSize);
-        
-        return jn_rv;
-    }
-    private static native int _imaqCreateAVI(long fileName, long compressionFilter, int quality, int framesPerSecond, int maxDataSize);
-
-    public static AVIInfo imaqGetAVIInfo(int session) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetAVIInfo(session, rv_addr+0);
-        AVIInfo info;
-        info = new AVIInfo(rv_buf, 0);
-        info.read();
-        return info;
-    }
-    private static native void _imaqGetAVIInfo(int session, long info);
-
     public static class GetFileInfoResult {
         public CalibrationUnit calibrationUnit;
         public float calibrationX;
@@ -20681,162 +20430,6 @@ public class NIVision {
     }
     private static native void _imaqGetFileInfo(long fileName, long calibrationUnit, long calibrationX, long calibrationY, long width, long height, long imageType);
 
-    public static class GetFilterNamesResult {
-        public String[] array;
-        private long array_addr;
-        private GetFilterNamesResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numFilters;
-            array_numFilters = rv_buf.getInt(0);
-            array = new String[array_numFilters];
-            if (array_numFilters > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numFilters*4);
-                for (int i=0, off=0; i<array_numFilters; i++, off += 4) {
-                    long addr = getPointer(bb, off);
-                    if (addr == 0)
-                        array[i] = null;
-                    else {
-                        ByteBuffer bb2 = newDirectByteBuffer(addr, 1000); // FIXME
-                        while (bb2.get() != 0) {}
-                        byte[] bytes = new byte[bb2.position()-1];
-                        bb2.rewind();
-                        getBytes(bb2, bytes, 0, bytes.length);
-                        try {
-                            array[i] = new String(bytes, "UTF-8");
-                        } catch (UnsupportedEncodingException e) {
-                            array[i] = "";
-                        }
-                    }
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static GetFilterNamesResult imaqGetFilterNames() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqGetFilterNames(rv_addr+0);
-        GetFilterNamesResult rv = new GetFilterNamesResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqGetFilterNames(long numFilters);
-
-    public static class LoadImagePopupResult {
-        public int cancelled;
-        public String[] array;
-        private long array_addr;
-        private LoadImagePopupResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            cancelled = rv_buf.getInt(0);
-            int array_numPaths;
-            array_numPaths = rv_buf.getInt(8);
-            array = new String[array_numPaths];
-            if (array_numPaths > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numPaths*4);
-                for (int i=0, off=0; i<array_numPaths; i++, off += 4) {
-                    long addr = getPointer(bb, off);
-                    if (addr == 0)
-                        array[i] = null;
-                    else {
-                        ByteBuffer bb2 = newDirectByteBuffer(addr, 1000); // FIXME
-                        while (bb2.get() != 0) {}
-                        byte[] bytes = new byte[bb2.position()-1];
-                        bb2.rewind();
-                        getBytes(bb2, bytes, 0, bytes.length);
-                        try {
-                            array[i] = new String(bytes, "UTF-8");
-                        } catch (UnsupportedEncodingException e) {
-                            array[i] = "";
-                        }
-                    }
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static LoadImagePopupResult imaqLoadImagePopup(String defaultDirectory, String defaultFileSpec, String fileTypeList, String title, int allowMultiplePaths, ButtonLabel buttonLabel, int restrictDirectory, int restrictExtension, int allowCancel, int allowMakeDirectory) {
-        ByteBuffer defaultDirectory_buf = null;
-        if (defaultDirectory != null) {
-            byte[] defaultDirectory_bytes;
-            try {
-                defaultDirectory_bytes = defaultDirectory.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                defaultDirectory_bytes = new byte[0];
-            }
-            defaultDirectory_buf = ByteBuffer.allocateDirect(defaultDirectory_bytes.length+1);
-            putBytes(defaultDirectory_buf, defaultDirectory_bytes, 0, defaultDirectory_bytes.length).put(defaultDirectory_bytes.length, (byte)0);
-        }
-        ByteBuffer defaultFileSpec_buf = null;
-        if (defaultFileSpec != null) {
-            byte[] defaultFileSpec_bytes;
-            try {
-                defaultFileSpec_bytes = defaultFileSpec.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                defaultFileSpec_bytes = new byte[0];
-            }
-            defaultFileSpec_buf = ByteBuffer.allocateDirect(defaultFileSpec_bytes.length+1);
-            putBytes(defaultFileSpec_buf, defaultFileSpec_bytes, 0, defaultFileSpec_bytes.length).put(defaultFileSpec_bytes.length, (byte)0);
-        }
-        ByteBuffer fileTypeList_buf = null;
-        if (fileTypeList != null) {
-            byte[] fileTypeList_bytes;
-            try {
-                fileTypeList_bytes = fileTypeList.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileTypeList_bytes = new byte[0];
-            }
-            fileTypeList_buf = ByteBuffer.allocateDirect(fileTypeList_bytes.length+1);
-            putBytes(fileTypeList_buf, fileTypeList_bytes, 0, fileTypeList_bytes.length).put(fileTypeList_bytes.length, (byte)0);
-        }
-        ByteBuffer title_buf = null;
-        if (title != null) {
-            byte[] title_bytes;
-            try {
-                title_bytes = title.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                title_bytes = new byte[0];
-            }
-            title_buf = ByteBuffer.allocateDirect(title_bytes.length+1);
-            putBytes(title_buf, title_bytes, 0, title_bytes.length).put(title_bytes.length, (byte)0);
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqLoadImagePopup(defaultDirectory == null ? 0 : getByteBufferAddress(defaultDirectory_buf), defaultFileSpec == null ? 0 : getByteBufferAddress(defaultFileSpec_buf), fileTypeList == null ? 0 : getByteBufferAddress(fileTypeList_buf), title == null ? 0 : getByteBufferAddress(title_buf), allowMultiplePaths, buttonLabel.getValue(), restrictDirectory, restrictExtension, allowCancel, allowMakeDirectory, rv_addr+0, rv_addr+8);
-        LoadImagePopupResult rv = new LoadImagePopupResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqLoadImagePopup(long defaultDirectory, long defaultFileSpec, long fileTypeList, long title, int allowMultiplePaths, int buttonLabel, int restrictDirectory, int restrictExtension, int allowCancel, int allowMakeDirectory, long cancelled, long numPaths);
-
-    public static int imaqOpenAVI(String fileName) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        int jn_rv = _imaqOpenAVI(fileName == null ? 0 : getByteBufferAddress(fileName_buf));
-        
-        return jn_rv;
-    }
-    private static native int _imaqOpenAVI(long fileName);
-
     public static void imaqReadFile(Image image, String fileName) {
         ByteBuffer fileName_buf;
         byte[] fileName_bytes;
@@ -20881,13 +20474,6 @@ public class NIVision {
     }
     private static native void _imaqReadVisionFile(long image, long fileName, long colorTable, long numColors);
 
-    public static void imaqWriteAVIFrame(Image image, int session, RawData data, int dataLength) {
-        
-        _imaqWriteAVIFrame(image.getAddress(), session, data.getAddress(), dataLength);
-        
-    }
-    private static native void _imaqWriteAVIFrame(long image, int session, long data, int dataLength);
-
     public static void imaqWriteBMPFile(Image image, String fileName, int compress, RGBValue colorTable) {
         ByteBuffer fileName_buf = null;
         if (fileName != null) {
@@ -20939,23 +20525,6 @@ public class NIVision {
     }
     private static native void _imaqWriteJPEGFile(long image, long fileName, int quality, long colorTable);
 
-    public static void imaqWriteJPEG2000File(Image image, String fileName, int lossless, float compressionRatio, JPEG2000FileAdvancedOptions advancedOptions, RGBValue colorTable) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        _imaqWriteJPEG2000File(image.getAddress(), fileName == null ? 0 : getByteBufferAddress(fileName_buf), lossless, compressionRatio, advancedOptions.getAddress(), colorTable.getAddress());
-        
-    }
-    private static native void _imaqWriteJPEG2000File(long image, long fileName, int lossless, float compressionRatio, long advancedOptions, long colorTable);
-
     public static void imaqWritePNGFile2(Image image, String fileName, int compressionSpeed, RGBValue colorTable, int useBitDepth) {
         ByteBuffer fileName_buf = null;
         if (fileName != null) {
@@ -21273,24 +20842,6 @@ public class NIVision {
      * Clipboard functions
      */
 
-    public static RGBValue imaqClipboardToImage(Image dest) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqClipboardToImage(dest.getAddress(), rv_addr+0);
-        RGBValue palette;
-        palette = new RGBValue(rv_buf, 0);
-        palette.read();
-        return palette;
-    }
-    private static native void _imaqClipboardToImage(long dest, long palette);
-
-    public static void imaqImageToClipboard(Image image, RGBValue palette) {
-        
-        _imaqImageToClipboard(image.getAddress(), palette == null ? 0 : palette.getAddress());
-        
-    }
-    private static native void _imaqImageToClipboard(long image, long palette);
-
     /**
      * Border functions
      */
@@ -21435,294 +20986,6 @@ public class NIVision {
      * Window Management functions
      */
 
-    public static int imaqAreScrollbarsVisible(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqAreScrollbarsVisible(windowNumber, rv_addr+0);
-        int visible;
-        visible = rv_buf.getInt(0);
-        return visible;
-    }
-    private static native void _imaqAreScrollbarsVisible(int windowNumber, long visible);
-
-    public static void imaqBringWindowToTop(int windowNumber) {
-        
-        _imaqBringWindowToTop(windowNumber);
-        
-    }
-    private static native void _imaqBringWindowToTop(int windowNumber);
-
-    public static class GetMousePosResult {
-        public Point position;
-        public int windowNumber;
-        private GetMousePosResult(ByteBuffer rv_buf) {
-            position = new Point(rv_buf, 0);
-            position.read();
-            windowNumber = rv_buf.getInt(8);
-        }
-    }
-
-    public static GetMousePosResult imaqGetMousePos() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetMousePos(rv_addr+0, rv_addr+8);
-        GetMousePosResult rv = new GetMousePosResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetMousePos(long position, long windowNumber);
-
-    public static class GetWindowBackgroundResult {
-        public WindowBackgroundFillStyle fillStyle;
-        public WindowBackgroundHatchStyle hatchStyle;
-        public RGBValue fillColor;
-        public RGBValue backgroundColor;
-        private GetWindowBackgroundResult(ByteBuffer rv_buf) {
-            fillStyle = WindowBackgroundFillStyle.fromValue(rv_buf.getInt(0));
-            hatchStyle = WindowBackgroundHatchStyle.fromValue(rv_buf.getInt(8));
-            fillColor = new RGBValue(rv_buf, 16);
-            fillColor.read();
-            backgroundColor = new RGBValue(rv_buf, 24);
-            backgroundColor.read();
-        }
-    }
-
-    public static GetWindowBackgroundResult imaqGetWindowBackground(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8+8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowBackground(windowNumber, rv_addr+0, rv_addr+8, rv_addr+16, rv_addr+24);
-        GetWindowBackgroundResult rv = new GetWindowBackgroundResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetWindowBackground(int windowNumber, long fillStyle, long hatchStyle, long fillColor, long backgroundColor);
-
-    public static DisplayMapping imaqGetWindowDisplayMapping(int windowNum) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowDisplayMapping(windowNum, rv_addr+0);
-        DisplayMapping mapping;
-        mapping = new DisplayMapping(rv_buf, 0);
-        mapping.read();
-        return mapping;
-    }
-    private static native void _imaqGetWindowDisplayMapping(int windowNum, long mapping);
-
-    public static class GetWindowGridResult {
-        public int xResolution;
-        public int yResolution;
-        private GetWindowGridResult(ByteBuffer rv_buf) {
-            xResolution = rv_buf.getInt(0);
-            yResolution = rv_buf.getInt(8);
-        }
-    }
-
-    public static GetWindowGridResult imaqGetWindowGrid(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowGrid(windowNumber, rv_addr+0, rv_addr+8);
-        GetWindowGridResult rv = new GetWindowGridResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetWindowGrid(int windowNumber, long xResolution, long yResolution);
-
-    public static int imaqGetWindowHandle() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowHandle(rv_addr+0);
-        int handle;
-        handle = rv_buf.getInt(0);
-        return handle;
-    }
-    private static native void _imaqGetWindowHandle(long handle);
-
-    public static Point imaqGetWindowPos(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowPos(windowNumber, rv_addr+0);
-        Point position;
-        position = new Point(rv_buf, 0);
-        position.read();
-        return position;
-    }
-    private static native void _imaqGetWindowPos(int windowNumber, long position);
-
-    public static class GetWindowSizeResult {
-        public int width;
-        public int height;
-        private GetWindowSizeResult(ByteBuffer rv_buf) {
-            width = rv_buf.getInt(0);
-            height = rv_buf.getInt(8);
-        }
-    }
-
-    public static GetWindowSizeResult imaqGetWindowSize(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowSize(windowNumber, rv_addr+0, rv_addr+8);
-        GetWindowSizeResult rv = new GetWindowSizeResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetWindowSize(int windowNumber, long width, long height);
-
-    public static String imaqGetWindowTitle(int windowNumber) {
-        
-        String jn_rv = _imaqGetWindowTitle(windowNumber);
-        
-        return jn_rv;
-    }
-    private static native String _imaqGetWindowTitle(int windowNumber);
-
-    public static class GetWindowZoom2Result {
-        public float xZoom;
-        public float yZoom;
-        private GetWindowZoom2Result(ByteBuffer rv_buf) {
-            xZoom = rv_buf.getFloat(0);
-            yZoom = rv_buf.getFloat(8);
-        }
-    }
-
-    public static GetWindowZoom2Result imaqGetWindowZoom2(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowZoom2(windowNumber, rv_addr+0, rv_addr+8);
-        GetWindowZoom2Result rv = new GetWindowZoom2Result(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetWindowZoom2(int windowNumber, long xZoom, long yZoom);
-
-    public static int imaqIsWindowNonTearing(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqIsWindowNonTearing(windowNumber, rv_addr+0);
-        int nonTearing;
-        nonTearing = rv_buf.getInt(0);
-        return nonTearing;
-    }
-    private static native void _imaqIsWindowNonTearing(int windowNumber, long nonTearing);
-
-    public static int imaqIsWindowVisible(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqIsWindowVisible(windowNumber, rv_addr+0);
-        int visible;
-        visible = rv_buf.getInt(0);
-        return visible;
-    }
-    private static native void _imaqIsWindowVisible(int windowNumber, long visible);
-
-    public static void imaqMoveWindow(int windowNumber, Point position) {
-        
-        _imaqMoveWindow(windowNumber, position.getAddress());
-        
-    }
-    private static native void _imaqMoveWindow(int windowNumber, long position);
-
-    public static void imaqSetupWindow(int windowNumber, int configuration) {
-        
-        _imaqSetupWindow(windowNumber, configuration);
-        
-    }
-    private static native void _imaqSetupWindow(int windowNumber, int configuration);
-
-    public static void imaqSetWindowBackground(int windowNumber, WindowBackgroundFillStyle fillStyle, WindowBackgroundHatchStyle hatchStyle, RGBValue fillColor, RGBValue backgroundColor) {
-        
-        _imaqSetWindowBackground(windowNumber, fillStyle.getValue(), hatchStyle.getValue(), fillColor.getAddress(), backgroundColor.getAddress());
-        
-    }
-    private static native void _imaqSetWindowBackground(int windowNumber, int fillStyle, int hatchStyle, long fillColor, long backgroundColor);
-
-    public static void imaqSetWindowDisplayMapping(int windowNumber, DisplayMapping mapping) {
-        
-        _imaqSetWindowDisplayMapping(windowNumber, mapping.getAddress());
-        
-    }
-    private static native void _imaqSetWindowDisplayMapping(int windowNumber, long mapping);
-
-    public static void imaqSetWindowGrid(int windowNumber, int xResolution, int yResolution) {
-        
-        _imaqSetWindowGrid(windowNumber, xResolution, yResolution);
-        
-    }
-    private static native void _imaqSetWindowGrid(int windowNumber, int xResolution, int yResolution);
-
-    public static void imaqSetWindowMaxContourCount(int windowNumber, int maxContourCount) {
-        
-        _imaqSetWindowMaxContourCount(windowNumber, maxContourCount);
-        
-    }
-    private static native void _imaqSetWindowMaxContourCount(int windowNumber, int maxContourCount);
-
-    public static void imaqSetWindowNonTearing(int windowNumber, int nonTearing) {
-        
-        _imaqSetWindowNonTearing(windowNumber, nonTearing);
-        
-    }
-    private static native void _imaqSetWindowNonTearing(int windowNumber, int nonTearing);
-
-    public static void imaqSetWindowPalette(int windowNumber, PaletteType type, RGBValue[] palette) {
-        int numColors = palette.length;
-        ByteBuffer palette_buf = null;
-        palette_buf = ByteBuffer.allocateDirect(palette.length*4).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<palette.length; i++, off += 4) {
-            palette[i].setBuffer(palette_buf, off);
-            palette[i].write();
-        }
-        _imaqSetWindowPalette(windowNumber, type.getValue(), getByteBufferAddress(palette_buf), numColors);
-        
-    }
-    private static native void _imaqSetWindowPalette(int windowNumber, int type, long palette, int numColors);
-
-    public static void imaqSetWindowSize(int windowNumber, int width, int height) {
-        
-        _imaqSetWindowSize(windowNumber, width, height);
-        
-    }
-    private static native void _imaqSetWindowSize(int windowNumber, int width, int height);
-
-    public static void imaqSetWindowThreadPolicy(WindowThreadPolicy policy) {
-        
-        _imaqSetWindowThreadPolicy(policy.getValue());
-        
-    }
-    private static native void _imaqSetWindowThreadPolicy(int policy);
-
-    public static void imaqSetWindowTitle(int windowNumber, String title) {
-        ByteBuffer title_buf = null;
-        if (title != null) {
-            byte[] title_bytes;
-            try {
-                title_bytes = title.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                title_bytes = new byte[0];
-            }
-            title_buf = ByteBuffer.allocateDirect(title_bytes.length+1);
-            putBytes(title_buf, title_bytes, 0, title_bytes.length).put(title_bytes.length, (byte)0);
-        }
-        _imaqSetWindowTitle(windowNumber, title == null ? 0 : getByteBufferAddress(title_buf));
-        
-    }
-    private static native void _imaqSetWindowTitle(int windowNumber, long title);
-
-    public static void imaqSetWindowZoomToFit(int windowNumber, int zoomToFit) {
-        
-        _imaqSetWindowZoomToFit(windowNumber, zoomToFit);
-        
-    }
-    private static native void _imaqSetWindowZoomToFit(int windowNumber, int zoomToFit);
-
-    public static void imaqShowScrollbars(int windowNumber, int visible) {
-        
-        _imaqShowScrollbars(windowNumber, visible);
-        
-    }
-    private static native void _imaqShowScrollbars(int windowNumber, int visible);
-
-    public static void imaqZoomWindow2(int windowNumber, float xZoom, float yZoom, Point center) {
-        
-        _imaqZoomWindow2(windowNumber, xZoom, yZoom, center.getAddress());
-        
-    }
-    private static native void _imaqZoomWindow2(int windowNumber, float xZoom, float yZoom, long center);
-
     /**
      * Utilities functions
      */
@@ -21741,102 +21004,6 @@ public class NIVision {
      * Tool Window functions
      */
 
-    public static void imaqCloseToolWindow() {
-        
-        _imaqCloseToolWindow();
-        
-    }
-    private static native void _imaqCloseToolWindow();
-
-    public static Tool imaqGetCurrentTool() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetCurrentTool(rv_addr+0);
-        Tool currentTool;
-        currentTool = Tool.fromValue(rv_buf.getInt(0));
-        return currentTool;
-    }
-    private static native void _imaqGetCurrentTool(long currentTool);
-
-    public static class GetLastEventResult {
-        public WindowEventType type;
-        public int windowNumber;
-        public Tool tool;
-        public Rect rect;
-        private GetLastEventResult(ByteBuffer rv_buf) {
-            type = WindowEventType.fromValue(rv_buf.getInt(0));
-            windowNumber = rv_buf.getInt(8);
-            tool = Tool.fromValue(rv_buf.getInt(16));
-            rect = new Rect(rv_buf, 24);
-            rect.read();
-        }
-    }
-
-    public static GetLastEventResult imaqGetLastEvent() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8+8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetLastEvent(rv_addr+0, rv_addr+8, rv_addr+16, rv_addr+24);
-        GetLastEventResult rv = new GetLastEventResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetLastEvent(long type, long windowNumber, long tool, long rect);
-
-    public static Point imaqGetToolWindowPos() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetToolWindowPos(rv_addr+0);
-        Point position;
-        position = new Point(rv_buf, 0);
-        position.read();
-        return position;
-    }
-    private static native void _imaqGetToolWindowPos(long position);
-
-    public static int imaqIsToolWindowVisible() {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqIsToolWindowVisible(rv_addr+0);
-        int visible;
-        visible = rv_buf.getInt(0);
-        return visible;
-    }
-    private static native void _imaqIsToolWindowVisible(long visible);
-
-    public static void imaqMoveToolWindow(Point position) {
-        
-        _imaqMoveToolWindow(position.getAddress());
-        
-    }
-    private static native void _imaqMoveToolWindow(long position);
-
-    public static void imaqSetCurrentTool(Tool currentTool) {
-        
-        _imaqSetCurrentTool(currentTool.getValue());
-        
-    }
-    private static native void _imaqSetCurrentTool(int currentTool);
-
-    public static void imaqSetToolColor(RGBValue color) {
-        
-        _imaqSetToolColor(color.getAddress());
-        
-    }
-    private static native void _imaqSetToolColor(long color);
-
-    public static void imaqSetupToolWindow(int showCoordinates, int maxIconsPerLine, ToolWindowOptions options) {
-        
-        _imaqSetupToolWindow(showCoordinates, maxIconsPerLine, options == null ? 0 : options.getAddress());
-        
-    }
-    private static native void _imaqSetupToolWindow(int showCoordinates, int maxIconsPerLine, long options);
-
-    public static void imaqShowToolWindow(int visible) {
-        
-        _imaqShowToolWindow(visible);
-        
-    }
-    private static native void _imaqShowToolWindow(int visible);
-
     /**
      * Meter functions
      */
@@ -22399,16 +21566,6 @@ public class NIVision {
      * Regions of Interest functions
      */
 
-    public static int imaqConstructROI2(Image image, ROI roi, Tool initialTool, ToolWindowOptions tools, ConstructROIOptions2 options) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqConstructROI2(image.getAddress(), roi.getAddress(), initialTool.getValue(), tools.getAddress(), options.getAddress(), rv_addr+0);
-        int okay;
-        okay = rv_buf.getInt(0);
-        return okay;
-    }
-    private static native void _imaqConstructROI2(long image, long roi, int initialTool, long tools, long options, long okay);
-
     public static ROI imaqCreateROI() {
         
         long jn_rv = _imaqCreateROI();
@@ -22439,14 +21596,6 @@ public class NIVision {
     }
     private static native void _imaqGetROIColor(long roi, long roiColor);
 
-    public static ROI imaqGetWindowROI(int windowNumber) {
-        
-        long jn_rv = _imaqGetWindowROI(windowNumber);
-        
-        return new ROI(jn_rv, true);
-    }
-    private static native long _imaqGetWindowROI(int windowNumber);
-
     public static void imaqSetROIColor(ROI roi, RGBValue color) {
         
         _imaqSetROIColor(roi.getAddress(), color.getAddress());
@@ -22454,13 +21603,6 @@ public class NIVision {
     }
     private static native void _imaqSetROIColor(long roi, long color);
 
-    public static void imaqSetWindowROI(int windowNumber, ROI roi) {
-        
-        _imaqSetWindowROI(windowNumber, roi == null ? 0 : roi.getAddress());
-        
-    }
-    private static native void _imaqSetWindowROI(int windowNumber, long roi);
-
     /**
      * Image Analysis functions
      */
@@ -23284,23 +22426,6 @@ public class NIVision {
     }
     private static native void _imaqOverlayLine(long image, long start, long end, long color, long group);
 
-    public static void imaqOverlayMetafile(Image image, RawData metafile, Rect rect, String group) {
-        ByteBuffer group_buf = null;
-        if (group != null) {
-            byte[] group_bytes;
-            try {
-                group_bytes = group.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                group_bytes = new byte[0];
-            }
-            group_buf = ByteBuffer.allocateDirect(group_bytes.length+1);
-            putBytes(group_buf, group_bytes, 0, group_bytes.length).put(group_bytes.length, (byte)0);
-        }
-        _imaqOverlayMetafile(image.getAddress(), metafile.getAddress(), rect.getAddress(), group == null ? 0 : getByteBufferAddress(group_buf));
-        
-    }
-    private static native void _imaqOverlayMetafile(long image, long metafile, long rect, long group);
-
     public static void imaqOverlayOpenContour(Image image, Point[] points, RGBValue color, String group) {
         int numPoints = points.length;
         ByteBuffer points_buf = null;
@@ -24231,432 +23356,6 @@ public class NIVision {
      * Obsolete functions
      */
 
-    public static void imaqWritePNGFile(Image image, String fileName, int compressionSpeed, RGBValue colorTable) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        _imaqWritePNGFile(image.getAddress(), fileName == null ? 0 : getByteBufferAddress(fileName_buf), compressionSpeed, colorTable == null ? 0 : colorTable.getAddress());
-        
-    }
-    private static native void _imaqWritePNGFile(long image, long fileName, int compressionSpeed, long colorTable);
-
-    public static class SelectParticlesResult {
-        public ParticleReport[] array;
-        private long array_addr;
-        private SelectParticlesResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_selectedCount;
-            array_selectedCount = rv_buf.getInt(0);
-            array = new ParticleReport[array_selectedCount];
-            if (array_selectedCount > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_selectedCount*84);
-                for (int i=0, off=0; i<array_selectedCount; i++, off += 84) {
-                    array[i] = new ParticleReport(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static SelectParticlesResult imaqSelectParticles(Image image, ParticleReport reports, int reportCount, int rejectBorder, SelectParticleCriteria criteria, int criteriaCount) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqSelectParticles(image.getAddress(), reports.getAddress(), reportCount, rejectBorder, criteria.getAddress(), criteriaCount, rv_addr+0);
-        SelectParticlesResult rv = new SelectParticlesResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqSelectParticles(long image, long reports, int reportCount, int rejectBorder, long criteria, int criteriaCount, long selectedCount);
-
-    public static void imaqParticleFilter(Image dest, Image source, ParticleFilterCriteria criteria, int criteriaCount, int rejectMatches, int connectivity8) {
-        
-        _imaqParticleFilter(dest.getAddress(), source.getAddress(), criteria.getAddress(), criteriaCount, rejectMatches, connectivity8);
-        
-    }
-    private static native void _imaqParticleFilter(long dest, long source, long criteria, int criteriaCount, int rejectMatches, int connectivity8);
-
-    public static class GetParticleInfoResult {
-        public ParticleReport[] array;
-        private long array_addr;
-        private GetParticleInfoResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_reportCount;
-            array_reportCount = rv_buf.getInt(0);
-            array = new ParticleReport[array_reportCount];
-            if (array_reportCount > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_reportCount*84);
-                for (int i=0, off=0; i<array_reportCount; i++, off += 84) {
-                    array[i] = new ParticleReport(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static GetParticleInfoResult imaqGetParticleInfo(Image image, int connectivity8, ParticleInfoMode mode) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqGetParticleInfo(image.getAddress(), connectivity8, mode.getValue(), rv_addr+0);
-        GetParticleInfoResult rv = new GetParticleInfoResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqGetParticleInfo(long image, int connectivity8, int mode, long reportCount);
-
-    public static float imaqCalcCoeff(Image image, ParticleReport report, MeasurementValue parameter) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqCalcCoeff(image.getAddress(), report.getAddress(), parameter.getValue(), rv_addr+0);
-        float coefficient;
-        coefficient = rv_buf.getFloat(0);
-        return coefficient;
-    }
-    private static native void _imaqCalcCoeff(long image, long report, int parameter, long coefficient);
-
-    public static class EdgeToolResult {
-        public EdgeReport[] array;
-        private long array_addr;
-        private EdgeToolResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numEdges;
-            array_numEdges = rv_buf.getInt(0);
-            array = new EdgeReport[array_numEdges];
-            if (array_numEdges > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numEdges*32);
-                for (int i=0, off=0; i<array_numEdges; i++, off += 32) {
-                    array[i] = new EdgeReport(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static EdgeToolResult imaqEdgeTool(Image image, Point points, int numPoints, EdgeOptions options) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqEdgeTool(image.getAddress(), points.getAddress(), numPoints, options.getAddress(), rv_addr+0);
-        EdgeToolResult rv = new EdgeToolResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqEdgeTool(long image, long points, int numPoints, long options, long numEdges);
-
-    public static class CirclesResult {
-        public CircleReport[] array;
-        private long array_addr;
-        private CirclesResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numCircles;
-            array_numCircles = rv_buf.getInt(0);
-            array = new CircleReport[array_numCircles];
-            if (array_numCircles > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numCircles*16);
-                for (int i=0, off=0; i<array_numCircles; i++, off += 16) {
-                    array[i] = new CircleReport(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static CirclesResult imaqCircles(Image dest, Image source, float minRadius, float maxRadius) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqCircles(dest.getAddress(), source.getAddress(), minRadius, maxRadius, rv_addr+0);
-        CirclesResult rv = new CirclesResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqCircles(long dest, long source, float minRadius, float maxRadius, long numCircles);
-
-    public static int imaqLabel(Image dest, Image source, int connectivity8) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqLabel(dest.getAddress(), source.getAddress(), connectivity8, rv_addr+0);
-        int particleCount;
-        particleCount = rv_buf.getInt(0);
-        return particleCount;
-    }
-    private static native void _imaqLabel(long dest, long source, int connectivity8, long particleCount);
-
-    public static BestEllipse imaqFitEllipse(PointFloat[] points) {
-        int numPoints = points.length;
-        ByteBuffer points_buf = null;
-        points_buf = ByteBuffer.allocateDirect(points.length*8).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<points.length; i++, off += 8) {
-            points[i].setBuffer(points_buf, off);
-            points[i].write();
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqFitEllipse(getByteBufferAddress(points_buf), numPoints, rv_addr+0);
-        BestEllipse ellipse;
-        ellipse = new BestEllipse(rv_buf, 0);
-        ellipse.read();
-        return ellipse;
-    }
-    private static native void _imaqFitEllipse(long points, int numPoints, long ellipse);
-
-    public static BestCircle imaqFitCircle(PointFloat[] points) {
-        int numPoints = points.length;
-        ByteBuffer points_buf = null;
-        points_buf = ByteBuffer.allocateDirect(points.length*8).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<points.length; i++, off += 8) {
-            points[i].setBuffer(points_buf, off);
-            points[i].write();
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqFitCircle(getByteBufferAddress(points_buf), numPoints, rv_addr+0);
-        BestCircle circle;
-        circle = new BestCircle(rv_buf, 0);
-        circle.read();
-        return circle;
-    }
-    private static native void _imaqFitCircle(long points, int numPoints, long circle);
-
-    public static class MatchPatternResult {
-        public PatternMatch[] array;
-        private long array_addr;
-        private MatchPatternResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numMatches;
-            array_numMatches = rv_buf.getInt(0);
-            array = new PatternMatch[array_numMatches];
-            if (array_numMatches > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numMatches*52);
-                for (int i=0, off=0; i<array_numMatches; i++, off += 52) {
-                    array[i] = new PatternMatch(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static MatchPatternResult imaqMatchPattern(Image image, Image pattern, MatchPatternOptions options, Rect searchRect) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqMatchPattern(image.getAddress(), pattern.getAddress(), options == null ? 0 : options.getAddress(), searchRect.getAddress(), rv_addr+0);
-        MatchPatternResult rv = new MatchPatternResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqMatchPattern(long image, long pattern, long options, long searchRect, long numMatches);
-
-    public static void imaqConvex(Image dest, Image source) {
-        
-        _imaqConvex(dest.getAddress(), source.getAddress());
-        
-    }
-    private static native void _imaqConvex(long dest, long source);
-
-    public static int imaqIsVisionInfoPresent(Image image, VisionInfoType type) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqIsVisionInfoPresent(image.getAddress(), type.getValue(), rv_addr+0);
-        int present;
-        present = rv_buf.getInt(0);
-        return present;
-    }
-    private static native void _imaqIsVisionInfoPresent(long image, int type, long present);
-
-    public static float imaqLineGaugeTool(Image image, Point start, Point end, LineGaugeMethod method, EdgeOptions edgeOptions, CoordinateTransform reference) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqLineGaugeTool(image.getAddress(), start.getAddress(), end.getAddress(), method.getValue(), edgeOptions.getAddress(), reference == null ? 0 : reference.getAddress(), rv_addr+0);
-        float distance;
-        distance = rv_buf.getFloat(0);
-        return distance;
-    }
-    private static native void _imaqLineGaugeTool(long image, long start, long end, int method, long edgeOptions, long reference, long distance);
-
-    public static class BestCircleResult {
-        public PointFloat center;
-        public double radius;
-        private BestCircleResult(ByteBuffer rv_buf) {
-            center = new PointFloat(rv_buf, 0);
-            center.read();
-            radius = rv_buf.getDouble(8);
-        }
-    }
-
-    public static BestCircleResult imaqBestCircle(PointFloat[] points) {
-        int numPoints = points.length;
-        ByteBuffer points_buf = null;
-        points_buf = ByteBuffer.allocateDirect(points.length*8).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<points.length; i++, off += 8) {
-            points[i].setBuffer(points_buf, off);
-            points[i].write();
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqBestCircle(getByteBufferAddress(points_buf), numPoints, rv_addr+0, rv_addr+8);
-        BestCircleResult rv = new BestCircleResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqBestCircle(long points, int numPoints, long center, long radius);
-
-    public static void imaqSavePattern(Image pattern, String fileName) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        _imaqSavePattern(pattern.getAddress(), fileName == null ? 0 : getByteBufferAddress(fileName_buf));
-        
-    }
-    private static native void _imaqSavePattern(long pattern, long fileName);
-
-    public static void imaqLoadPattern(Image pattern, String fileName) {
-        ByteBuffer fileName_buf = null;
-        if (fileName != null) {
-            byte[] fileName_bytes;
-            try {
-                fileName_bytes = fileName.getBytes("UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                fileName_bytes = new byte[0];
-            }
-            fileName_buf = ByteBuffer.allocateDirect(fileName_bytes.length+1);
-            putBytes(fileName_buf, fileName_bytes, 0, fileName_bytes.length).put(fileName_bytes.length, (byte)0);
-        }
-        _imaqLoadPattern(pattern.getAddress(), fileName == null ? 0 : getByteBufferAddress(fileName_buf));
-        
-    }
-    private static native void _imaqLoadPattern(long pattern, long fileName);
-
-    public static void imaqTransformROI(ROI roi, Point originStart, float angleStart, Point originFinal, float angleFinal) {
-        
-        _imaqTransformROI(roi.getAddress(), originStart.getAddress(), angleStart, originFinal.getAddress(), angleFinal);
-        
-    }
-    private static native void _imaqTransformROI(long roi, long originStart, float angleStart, long originFinal, float angleFinal);
-
-    public static class CoordinateReferenceResult {
-        public Point origin;
-        public float angle;
-        private CoordinateReferenceResult(ByteBuffer rv_buf) {
-            origin = new Point(rv_buf, 0);
-            origin.read();
-            angle = rv_buf.getFloat(8);
-        }
-    }
-
-    public static CoordinateReferenceResult imaqCoordinateReference(Point points, ReferenceMode mode) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqCoordinateReference(points.getAddress(), mode.getValue(), rv_addr+0, rv_addr+8);
-        CoordinateReferenceResult rv = new CoordinateReferenceResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqCoordinateReference(long points, int mode, long origin, long angle);
-
-    public static ContourInfo imaqGetContourInfo(ROI roi, int id) {
-        
-        long jn_rv = _imaqGetContourInfo(roi.getAddress(), id);
-        
-        return new ContourInfo(jn_rv, true);
-    }
-    private static native long _imaqGetContourInfo(long roi, int id);
-
-    public static void imaqSetWindowOverlay(int windowNumber, Overlay overlay) {
-        
-        _imaqSetWindowOverlay(windowNumber, overlay == null ? 0 : overlay.getAddress());
-        
-    }
-    private static native void _imaqSetWindowOverlay(int windowNumber, long overlay);
-
-    public static Overlay imaqCreateOverlayFromROI(ROI roi) {
-        
-        long jn_rv = _imaqCreateOverlayFromROI(roi.getAddress());
-        
-        return new Overlay(jn_rv, true);
-    }
-    private static native long _imaqCreateOverlayFromROI(long roi);
-
-    public static Overlay imaqCreateOverlayFromMetafile(RawData metafile) {
-        
-        long jn_rv = _imaqCreateOverlayFromMetafile(metafile.getAddress());
-        
-        return new Overlay(jn_rv, true);
-    }
-    private static native long _imaqCreateOverlayFromMetafile(long metafile);
-
-    public static void imaqSetCalibrationInfo(Image image, CalibrationUnit unit, float xDistance, float yDistance) {
-        
-        _imaqSetCalibrationInfo(image.getAddress(), unit.getValue(), xDistance, yDistance);
-        
-    }
-    private static native void _imaqSetCalibrationInfo(long image, int unit, float xDistance, float yDistance);
-
-    public static class GetCalibrationInfoResult {
-        public CalibrationUnit unit;
-        public float xDistance;
-        public float yDistance;
-        private GetCalibrationInfoResult(ByteBuffer rv_buf) {
-            unit = CalibrationUnit.fromValue(rv_buf.getInt(0));
-            xDistance = rv_buf.getFloat(8);
-            yDistance = rv_buf.getFloat(16);
-        }
-    }
-
-    public static GetCalibrationInfoResult imaqGetCalibrationInfo(Image image) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetCalibrationInfo(image.getAddress(), rv_addr+0, rv_addr+8, rv_addr+16);
-        GetCalibrationInfoResult rv = new GetCalibrationInfoResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetCalibrationInfo(long image, long unit, long xDistance, long yDistance);
-
-    public static int imaqConstructROI(Image image, ROI roi, Tool initialTool, ToolWindowOptions tools, ConstructROIOptions options) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqConstructROI(image.getAddress(), roi.getAddress(), initialTool.getValue(), tools.getAddress(), options.getAddress(), rv_addr+0);
-        int okay;
-        okay = rv_buf.getInt(0);
-        return okay;
-    }
-    private static native void _imaqConstructROI(long image, long roi, int initialTool, long tools, long options, long okay);
-
     public static class GetParticleClassifierOptionsResult {
         public ParticleClassifierPreprocessingOptions preprocessingOptions;
         public ParticleClassifierOptions options;
@@ -24677,31 +23376,6 @@ public class NIVision {
     }
     private static native void _imaqGetParticleClassifierOptions(long session, long preprocessingOptions, long options);
 
-    public static void imaqZoomWindow(int windowNumber, int xZoom, int yZoom, Point center) {
-        
-        _imaqZoomWindow(windowNumber, xZoom, yZoom, center.getAddress());
-        
-    }
-    private static native void _imaqZoomWindow(int windowNumber, int xZoom, int yZoom, long center);
-
-    public static class GetWindowZoomResult {
-        public int xZoom;
-        public int yZoom;
-        private GetWindowZoomResult(ByteBuffer rv_buf) {
-            xZoom = rv_buf.getInt(0);
-            yZoom = rv_buf.getInt(8);
-        }
-    }
-
-    public static GetWindowZoomResult imaqGetWindowZoom(int windowNumber) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8+8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqGetWindowZoom(windowNumber, rv_addr+0, rv_addr+8);
-        GetWindowZoomResult rv = new GetWindowZoomResult(rv_buf);
-        return rv;
-    }
-    private static native void _imaqGetWindowZoom(int windowNumber, long xZoom, long yZoom);
-
     public static int imaqParticleFilter3(Image dest, Image source, ParticleFilterCriteria2 criteria, int criteriaCount, ParticleFilterOptions options, ROI roi) {
         ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
         long rv_addr = getByteBufferAddress(rv_buf);
@@ -24712,14 +23386,6 @@ public class NIVision {
     }
     private static native void _imaqParticleFilter3(long dest, long source, long criteria, int criteriaCount, long options, long roi, long numParticles);
 
-    public static ReadTextReport2 imaqReadText2(Image image, CharSet set, ROI roi, ReadTextOptions readOptions, OCRProcessingOptions processingOptions, OCRSpacingOptions spacingOptions) {
-        
-        long jn_rv = _imaqReadText2(image.getAddress(), set.getAddress(), roi.getAddress(), readOptions.getAddress(), processingOptions.getAddress(), spacingOptions.getAddress());
-        
-        return new ReadTextReport2(jn_rv, true);
-    }
-    private static native long _imaqReadText2(long image, long set, long roi, long readOptions, long processingOptions, long spacingOptions);
-
     public static LearnPatternAdvancedOptions imaqLearnPattern2(Image image, LearningMode learningMode) {
         ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
         long rv_addr = getByteBufferAddress(rv_buf);
@@ -24762,13 +23428,6 @@ public class NIVision {
     }
     private static native long _imaqSpoke(long image, long roi, int direction, int process, long options);
 
-    public static void imaqLearnPattern(Image image, LearningMode learningMode) {
-        
-        _imaqLearnPattern(image.getAddress(), learningMode.getValue());
-        
-    }
-    private static native void _imaqLearnPattern(long image, int learningMode);
-
     public static class MatchPattern2Result {
         public PatternMatch[] array;
         private long array_addr;
@@ -24809,177 +23468,6 @@ public class NIVision {
     }
     private static native void _imaqSetParticleClassifierOptions(long session, long preprocessingOptions, long options);
 
-    public static void imaqCopyCalibrationInfo(Image dest, Image source) {
-        
-        _imaqCopyCalibrationInfo(dest.getAddress(), source.getAddress());
-        
-    }
-    private static native void _imaqCopyCalibrationInfo(long dest, long source);
-
-    public static int imaqParticleFilter2(Image dest, Image source, ParticleFilterCriteria2[] criteria, int rejectMatches, int connectivity8) {
-        int criteriaCount = criteria.length;
-        ByteBuffer criteria_buf = null;
-        criteria_buf = ByteBuffer.allocateDirect(criteria.length*20).order(ByteOrder.nativeOrder());
-        for (int i=0, off=0; i<criteria.length; i++, off += 20) {
-            criteria[i].setBuffer(criteria_buf, off);
-            criteria[i].write();
-        }
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        _imaqParticleFilter2(dest.getAddress(), source.getAddress(), getByteBufferAddress(criteria_buf), criteriaCount, rejectMatches, connectivity8, rv_addr+0);
-        int numParticles;
-        numParticles = rv_buf.getInt(0);
-        return numParticles;
-    }
-    private static native void _imaqParticleFilter2(long dest, long source, long criteria, int criteriaCount, int rejectMatches, int connectivity8, long numParticles);
-
-    public static class EdgeTool2Result {
-        public EdgeReport[] array;
-        private long array_addr;
-        private EdgeTool2Result(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numEdges;
-            array_numEdges = rv_buf.getInt(0);
-            array = new EdgeReport[array_numEdges];
-            if (array_numEdges > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numEdges*32);
-                for (int i=0, off=0; i<array_numEdges; i++, off += 32) {
-                    array[i] = new EdgeReport(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static EdgeTool2Result imaqEdgeTool2(Image image, Point points, int numPoints, EdgeProcess process, EdgeOptions options) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqEdgeTool2(image.getAddress(), points.getAddress(), numPoints, process.getValue(), options.getAddress(), rv_addr+0);
-        EdgeTool2Result rv = new EdgeTool2Result(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqEdgeTool2(long image, long points, int numPoints, int process, long options, long numEdges);
-
-    public static int imaqAddRotatedRectContour(ROI roi, RotatedRect rect) {
-        
-        int jn_rv = _imaqAddRotatedRectContour(roi.getAddress(), rect.getAddress());
-        
-        return jn_rv;
-    }
-    private static native int _imaqAddRotatedRectContour(long roi, long rect);
-
-    public static class ReadDataMatrixBarcodeResult {
-        public Barcode2DInfo[] array;
-        private long array_addr;
-        private ReadDataMatrixBarcodeResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numBarcodes;
-            array_numBarcodes = rv_buf.getInt(0);
-            array = new Barcode2DInfo[array_numBarcodes];
-            if (array_numBarcodes > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numBarcodes*64);
-                for (int i=0, off=0; i<array_numBarcodes; i++, off += 64) {
-                    array[i] = new Barcode2DInfo(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static ReadDataMatrixBarcodeResult imaqReadDataMatrixBarcode(Image image, ROI roi, DataMatrixOptions options) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqReadDataMatrixBarcode(image.getAddress(), roi.getAddress(), options.getAddress(), rv_addr+0);
-        ReadDataMatrixBarcodeResult rv = new ReadDataMatrixBarcodeResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqReadDataMatrixBarcode(long image, long roi, long options, long numBarcodes);
-
-    public static LinearAverages imaqLinearAverages(Image image, Rect rect) {
-        
-        long jn_rv = _imaqLinearAverages(image.getAddress(), rect.getAddress());
-        
-        return new LinearAverages(jn_rv, true);
-    }
-    private static native long _imaqLinearAverages(long image, long rect);
-
-    public static class MatchGeometricPatternResult {
-        public GeometricPatternMatch[] array;
-        private long array_addr;
-        private MatchGeometricPatternResult(ByteBuffer rv_buf, long jn_rv) {
-            array_addr = jn_rv;
-            int array_numMatches;
-            array_numMatches = rv_buf.getInt(0);
-            array = new GeometricPatternMatch[array_numMatches];
-            if (array_numMatches > 0 && array_addr != 0) {
-                ByteBuffer bb = newDirectByteBuffer(array_addr, array_numMatches*72);
-                for (int i=0, off=0; i<array_numMatches; i++, off += 72) {
-                    array[i] = new GeometricPatternMatch(bb, off);
-                    array[i].read();
-                }
-            }
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            imaqDispose(array_addr);
-            super.finalize();
-        }
-    }
-
-    public static MatchGeometricPatternResult imaqMatchGeometricPattern(Image image, Image pattern, CurveOptions curveOptions, MatchGeometricPatternOptions matchOptions, MatchGeometricPatternAdvancedOptions advancedMatchOptions, ROI roi) {
-        ByteBuffer rv_buf = ByteBuffer.allocateDirect(8).order(ByteOrder.nativeOrder());
-        long rv_addr = getByteBufferAddress(rv_buf);
-        long jn_rv = _imaqMatchGeometricPattern(image.getAddress(), pattern.getAddress(), curveOptions.getAddress(), matchOptions.getAddress(), advancedMatchOptions.getAddress(), roi.getAddress(), rv_addr+0);
-        MatchGeometricPatternResult rv = new MatchGeometricPatternResult(rv_buf, jn_rv);
-        return rv;
-    }
-    private static native long _imaqMatchGeometricPattern(long image, long pattern, long curveOptions, long matchOptions, long advancedMatchOptions, long roi, long numMatches);
-
-    public static CharInfo imaqGetCharInfo(CharSet set, int index) {
-        
-        long jn_rv = _imaqGetCharInfo(set.getAddress(), index);
-        
-        return new CharInfo(jn_rv, true);
-    }
-    private static native long _imaqGetCharInfo(long set, int index);
-
-    public static ReadTextReport imaqReadText(Image image, CharSet set, ROI roi, ReadTextOptions readOptions, OCRProcessingOptions processingOptions, OCRSpacingOptions spacingOptions) {
-        
-        long jn_rv = _imaqReadText(image.getAddress(), set.getAddress(), roi.getAddress(), readOptions.getAddress(), processingOptions.getAddress(), spacingOptions.getAddress());
-        
-        return new ReadTextReport(jn_rv, true);
-    }
-    private static native long _imaqReadText(long image, long set, long roi, long readOptions, long processingOptions, long spacingOptions);
-
-    public static ThresholdData imaqAutoThreshold(Image dest, Image source, int numClasses, ThresholdMethod method) {
-        
-        long jn_rv = _imaqAutoThreshold(dest.getAddress(), source.getAddress(), numClasses, method.getValue());
-        
-        return new ThresholdData(jn_rv, true);
-    }
-    private static native long _imaqAutoThreshold(long dest, long source, int numClasses, int method);
-
-    public static ColorHistogramReport imaqColorHistogram(Image image, int numClasses, ColorMode mode, Image mask) {
-        
-        long jn_rv = _imaqColorHistogram(image.getAddress(), numClasses, mode.getValue(), mask == null ? 0 : mask.getAddress());
-        
-        return new ColorHistogramReport(jn_rv, true);
-    }
-    private static native long _imaqColorHistogram(long image, int numClasses, int mode, long mask);
-
     public static RakeReport imaqRake(Image image, ROI roi, RakeDirection direction, EdgeProcess process, RakeOptions options) {
         
         long jn_rv = _imaqRake(image.getAddress(), roi.getAddress(), direction.getValue(), process.getValue(), options.getAddress());
diff --git a/wpilibj/wpilibJavaJNI/lib/NIVisionJNI.cpp b/wpilibj/wpilibJavaJNI/lib/NIVisionJNI.cpp
index a96097b553..fc3d2e6171 100644
--- a/wpilibj/wpilibJavaJNI/lib/NIVisionJNI.cpp
+++ b/wpilibj/wpilibJavaJNI/lib/NIVisionJNI.cpp
@@ -440,132 +440,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSkeleton(JNIEnv* env, j
  * Acquisition functions
  */
 
-/* J: Image imaqCopyFromRing(long sessionID, Image image, int imageToCopy, Rect rect)
- * JN: long imaqCopyFromRing(long sessionID, long image, int imageToCopy, long imageNumber, long rect)
- * C: Image* imaqCopyFromRing(SESSION_ID sessionID, Image* image, int imageToCopy, int* imageNumber, Rect rect)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqCopyFromRing(JNIEnv* env, jclass , jlong sessionID, jlong image, jint imageToCopy, jlong imageNumber, jlong rect)
-{
-    Image* rv = imaqCopyFromRing((SESSION_ID)sessionID, (Image*)image, (int)imageToCopy, (int*)imageNumber, *((Rect*)rect));
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: Image imaqEasyAcquire(String interfaceName)
- * JN: long imaqEasyAcquire(long interfaceName)
- * C: Image* imaqEasyAcquire(const char* interfaceName)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqEasyAcquire(JNIEnv* env, jclass , jlong interfaceName)
-{
-    Image* rv = imaqEasyAcquire((const char*)interfaceName);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: Image imaqExtractFromRing(long sessionID, int imageToExtract)
- * JN: long imaqExtractFromRing(long sessionID, int imageToExtract, long imageNumber)
- * C: Image* imaqExtractFromRing(SESSION_ID sessionID, int imageToExtract, int* imageNumber)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqExtractFromRing(JNIEnv* env, jclass , jlong sessionID, jint imageToExtract, jlong imageNumber)
-{
-    Image* rv = imaqExtractFromRing((SESSION_ID)sessionID, (int)imageToExtract, (int*)imageNumber);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: Image imaqGrab(long sessionID, Image image, int immediate)
- * JN: long imaqGrab(long sessionID, long image, int immediate)
- * C: Image* imaqGrab(SESSION_ID sessionID, Image* image, int immediate)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGrab(JNIEnv* env, jclass , jlong sessionID, jlong image, jint immediate)
-{
-    Image* rv = imaqGrab((SESSION_ID)sessionID, (Image*)image, (int)immediate);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqReleaseImage(long sessionID)
- * JN: void imaqReleaseImage(long sessionID)
- * C: int imaqReleaseImage(SESSION_ID sessionID)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqReleaseImage(JNIEnv* env, jclass , jlong sessionID)
-{
-    int rv = imaqReleaseImage((SESSION_ID)sessionID);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetupGrab(long sessionID, Rect rect)
- * JN: void imaqSetupGrab(long sessionID, long rect)
- * C: int imaqSetupGrab(SESSION_ID sessionID, Rect rect)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetupGrab(JNIEnv* env, jclass , jlong sessionID, jlong rect)
-{
-    int rv = imaqSetupGrab((SESSION_ID)sessionID, *((Rect*)rect));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetupRing(long sessionID, Image[] images, int skipCount, Rect rect)
- * JN: void imaqSetupRing(long sessionID, long images, int numImages, int skipCount, long rect)
- * C: int imaqSetupRing(SESSION_ID sessionID, Image** images, int numImages, int skipCount, Rect rect)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetupRing(JNIEnv* env, jclass , jlong sessionID, jlong images, jint numImages, jint skipCount, jlong rect)
-{
-    int rv = imaqSetupRing((SESSION_ID)sessionID, (Image**)images, (int)numImages, (int)skipCount, *((Rect*)rect));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetupSequence(long sessionID, Image[] images, int skipCount, Rect rect)
- * JN: void imaqSetupSequence(long sessionID, long images, int numImages, int skipCount, long rect)
- * C: int imaqSetupSequence(SESSION_ID sessionID, Image** images, int numImages, int skipCount, Rect rect)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetupSequence(JNIEnv* env, jclass , jlong sessionID, jlong images, jint numImages, jint skipCount, jlong rect)
-{
-    int rv = imaqSetupSequence((SESSION_ID)sessionID, (Image**)images, (int)numImages, (int)skipCount, *((Rect*)rect));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: Image imaqSnap(long sessionID, Image image, Rect rect)
- * JN: long imaqSnap(long sessionID, long image, long rect)
- * C: Image* imaqSnap(SESSION_ID sessionID, Image* image, Rect rect)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqSnap(JNIEnv* env, jclass , jlong sessionID, jlong image, jlong rect)
-{
-    Image* rv = imaqSnap((SESSION_ID)sessionID, (Image*)image, *((Rect*)rect));
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqStartAcquisition(long sessionID)
- * JN: void imaqStartAcquisition(long sessionID)
- * C: int imaqStartAcquisition(SESSION_ID sessionID)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqStartAcquisition(JNIEnv* env, jclass , jlong sessionID)
-{
-    int rv = imaqStartAcquisition((SESSION_ID)sessionID);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqStopAcquisition(long sessionID)
- * JN: void imaqStopAcquisition(long sessionID)
- * C: int imaqStopAcquisition(SESSION_ID sessionID)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqStopAcquisition(JNIEnv* env, jclass , jlong sessionID)
-{
-    int rv = imaqStopAcquisition((SESSION_ID)sessionID);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Arithmetic functions
  */
@@ -944,17 +818,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqDrawShapeOnImage(JNIEnv
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqDrawTextOnImage(Image dest, Image source, Point coord, String text, DrawTextOptions options)
- * JN: void imaqDrawTextOnImage(long dest, long source, long coord, long text, long options, long fontNameUsed)
- * C: int imaqDrawTextOnImage(Image* dest, const Image* source, Point coord, const char* text, const DrawTextOptions* options, int* fontNameUsed)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqDrawTextOnImage(JNIEnv* env, jclass , jlong dest, jlong source, jlong coord, jlong text, jlong options, jlong fontNameUsed)
-{
-    int rv = imaqDrawTextOnImage((Image*)dest, (const Image*)source, *((Point*)coord), (const char*)text, (const DrawTextOptions*)options, (int*)fontNameUsed);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Interlacing functions
  */
@@ -1167,83 +1030,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWriteCustomData(JNIEnv*
  * Display functions
  */
 
-/* J: void imaqAreToolsContextSensitive()
- * JN: void imaqAreToolsContextSensitive(long sensitive)
- * C: int imaqAreToolsContextSensitive(int* sensitive)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqAreToolsContextSensitive(JNIEnv* env, jclass , jlong sensitive)
-{
-    int rv = imaqAreToolsContextSensitive((int*)sensitive);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqCloseWindow(int windowNumber)
- * JN: void imaqCloseWindow(int windowNumber)
- * C: int imaqCloseWindow(int windowNumber)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCloseWindow(JNIEnv* env, jclass , jint windowNumber)
-{
-    int rv = imaqCloseWindow((int)windowNumber);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqDisplayImage(Image image, int windowNumber, int resize)
- * JN: void imaqDisplayImage(long image, int windowNumber, int resize)
- * C: int imaqDisplayImage(const Image* image, int windowNumber, int resize)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqDisplayImage(JNIEnv* env, jclass , jlong image, jint windowNumber, jint resize)
-{
-    int rv = imaqDisplayImage((const Image*)image, (int)windowNumber, (int)resize);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetLastKey()
- * JN: void imaqGetLastKey(long keyPressed, long windowNumber, long modifiers)
- * C: int imaqGetLastKey(char* keyPressed, int* windowNumber, int* modifiers)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetLastKey(JNIEnv* env, jclass , jlong keyPressed, jlong windowNumber, jlong modifiers)
-{
-    int rv = imaqGetLastKey((char*)keyPressed, (int*)windowNumber, (int*)modifiers);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowCenterPos(int windowNumber)
- * JN: void imaqGetWindowCenterPos(int windowNumber, long centerPosition)
- * C: int imaqGetWindowCenterPos(int windowNumber, Point* centerPosition)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowCenterPos(JNIEnv* env, jclass , jint windowNumber, jlong centerPosition)
-{
-    int rv = imaqGetWindowCenterPos((int)windowNumber, (Point*)centerPosition);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetToolContextSensitivity(int sensitive)
- * JN: void imaqSetToolContextSensitivity(int sensitive)
- * C: int imaqSetToolContextSensitivity(int sensitive)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetToolContextSensitivity(JNIEnv* env, jclass , jint sensitive)
-{
-    int rv = imaqSetToolContextSensitivity((int)sensitive);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqShowWindow(int windowNumber, int visible)
- * JN: void imaqShowWindow(int windowNumber, int visible)
- * C: int imaqShowWindow(int windowNumber, int visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqShowWindow(JNIEnv* env, jclass , jint windowNumber, jint visible)
-{
-    int rv = imaqShowWindow((int)windowNumber, (int)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Image Manipulation functions
  */
@@ -1374,40 +1160,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqView3D(JNIEnv* env, jcl
  * File I/O functions
  */
 
-/* J: void imaqCloseAVI(int session)
- * JN: void imaqCloseAVI(int session)
- * C: int imaqCloseAVI(AVISession session)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCloseAVI(JNIEnv* env, jclass , jint session)
-{
-    int rv = imaqCloseAVI((AVISession)session);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: int imaqCreateAVI(String fileName, String compressionFilter, int quality, int framesPerSecond, int maxDataSize)
- * JN: int imaqCreateAVI(long fileName, long compressionFilter, int quality, int framesPerSecond, int maxDataSize)
- * C: AVISession imaqCreateAVI(const char* fileName, const char* compressionFilter, int quality, unsigned int framesPerSecond, unsigned int maxDataSize)
- */
-
-JNIEXPORT jint JNICALL Java_com_ni_vision_NIVision__1imaqCreateAVI(JNIEnv* env, jclass , jlong fileName, jlong compressionFilter, jint quality, jint framesPerSecond, jint maxDataSize)
-{
-    AVISession rv = imaqCreateAVI((const char*)fileName, (const char*)compressionFilter, (int)quality, (unsigned int)framesPerSecond, (unsigned int)maxDataSize);
-    
-    return (jint)rv;
-}
-
-/* J: void imaqGetAVIInfo(int session)
- * JN: void imaqGetAVIInfo(int session, long info)
- * C: int imaqGetAVIInfo(AVISession session, AVIInfo* info)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetAVIInfo(JNIEnv* env, jclass , jint session, jlong info)
-{
-    int rv = imaqGetAVIInfo((AVISession)session, (AVIInfo*)info);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqGetFileInfo(String fileName)
  * JN: void imaqGetFileInfo(long fileName, long calibrationUnit, long calibrationX, long calibrationY, long width, long height, long imageType)
  * C: int imaqGetFileInfo(const char* fileName, CalibrationUnit* calibrationUnit, float* calibrationX, float* calibrationY, int* width, int* height, ImageType* imageType)
@@ -1419,42 +1171,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetFileInfo(JNIEnv* env
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: GetFilterNamesResult imaqGetFilterNames()
- * JN: long imaqGetFilterNames(long numFilters)
- * C: FilterName* imaqGetFilterNames(int* numFilters)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGetFilterNames(JNIEnv* env, jclass , jlong numFilters)
-{
-    FilterName* rv = imaqGetFilterNames((int*)numFilters);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: LoadImagePopupResult imaqLoadImagePopup(String defaultDirectory, String defaultFileSpec, String fileTypeList, String title, int allowMultiplePaths, ButtonLabel buttonLabel, int restrictDirectory, int restrictExtension, int allowCancel, int allowMakeDirectory)
- * JN: long imaqLoadImagePopup(long defaultDirectory, long defaultFileSpec, long fileTypeList, long title, int allowMultiplePaths, int buttonLabel, int restrictDirectory, int restrictExtension, int allowCancel, int allowMakeDirectory, long cancelled, long numPaths)
- * C: char** imaqLoadImagePopup(const char* defaultDirectory, const char* defaultFileSpec, const char* fileTypeList, const char* title, int allowMultiplePaths, ButtonLabel buttonLabel, int restrictDirectory, int restrictExtension, int allowCancel, int allowMakeDirectory, int* cancelled, int* numPaths)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqLoadImagePopup(JNIEnv* env, jclass , jlong defaultDirectory, jlong defaultFileSpec, jlong fileTypeList, jlong title, jint allowMultiplePaths, jint buttonLabel, jint restrictDirectory, jint restrictExtension, jint allowCancel, jint allowMakeDirectory, jlong cancelled, jlong numPaths)
-{
-    char** rv = imaqLoadImagePopup((const char*)defaultDirectory, (const char*)defaultFileSpec, (const char*)fileTypeList, (const char*)title, (int)allowMultiplePaths, (ButtonLabel)buttonLabel, (int)restrictDirectory, (int)restrictExtension, (int)allowCancel, (int)allowMakeDirectory, (int*)cancelled, (int*)numPaths);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: int imaqOpenAVI(String fileName)
- * JN: int imaqOpenAVI(long fileName)
- * C: AVISession imaqOpenAVI(const char* fileName)
- */
-
-JNIEXPORT jint JNICALL Java_com_ni_vision_NIVision__1imaqOpenAVI(JNIEnv* env, jclass , jlong fileName)
-{
-    AVISession rv = imaqOpenAVI((const char*)fileName);
-    
-    return (jint)rv;
-}
-
 JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqReadFile(JNIEnv* env, jclass , jlong image, jlong fileName, jlong colorTable, jlong numColors)
 {
     int rv = imaqReadFile((Image*)image, (const char*)fileName, (RGBValue*)colorTable, (int*)numColors);
@@ -1472,17 +1188,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqReadVisionFile(JNIEnv*
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqWriteAVIFrame(Image image, int session, RawData data, int dataLength)
- * JN: void imaqWriteAVIFrame(long image, int session, long data, int dataLength)
- * C: int imaqWriteAVIFrame(Image* image, AVISession session, const void* data, unsigned int dataLength)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWriteAVIFrame(JNIEnv* env, jclass , jlong image, jint session, jlong data, jint dataLength)
-{
-    int rv = imaqWriteAVIFrame((Image*)image, (AVISession)session, (const void*)data, (unsigned int)dataLength);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqWriteBMPFile(Image image, String fileName, int compress, RGBValue colorTable)
  * JN: void imaqWriteBMPFile(long image, long fileName, int compress, long colorTable)
  * C: int imaqWriteBMPFile(const Image* image, const char* fileName, int compress, const RGBValue* colorTable)
@@ -1516,17 +1221,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWriteJPEGFile(JNIEnv* e
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqWriteJPEG2000File(Image image, String fileName, int lossless, float compressionRatio, JPEG2000FileAdvancedOptions advancedOptions, RGBValue colorTable)
- * JN: void imaqWriteJPEG2000File(long image, long fileName, int lossless, float compressionRatio, long advancedOptions, long colorTable)
- * C: int imaqWriteJPEG2000File(const Image* image, const char* fileName, int lossless, float compressionRatio, const JPEG2000FileAdvancedOptions* advancedOptions, const RGBValue* colorTable)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWriteJPEG2000File(JNIEnv* env, jclass , jlong image, jlong fileName, jint lossless, jfloat compressionRatio, jlong advancedOptions, jlong colorTable)
-{
-    int rv = imaqWriteJPEG2000File((const Image*)image, (const char*)fileName, (int)lossless, (float)compressionRatio, (const JPEG2000FileAdvancedOptions*)advancedOptions, (const RGBValue*)colorTable);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqWritePNGFile2(Image image, String fileName, int compressionSpeed, RGBValue colorTable, int useBitDepth)
  * JN: void imaqWritePNGFile2(long image, long fileName, int compressionSpeed, long colorTable, int useBitDepth)
  * C: int imaqWritePNGFile2(const Image* image, const char* fileName, unsigned int compressionSpeed, const RGBValue* colorTable, int useBitDepth)
@@ -1728,28 +1422,6 @@ JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqInterpolatePoints(JNIE
  * Clipboard functions
  */
 
-/* J: void imaqClipboardToImage(Image dest)
- * JN: void imaqClipboardToImage(long dest, long palette)
- * C: int imaqClipboardToImage(Image* dest, RGBValue* palette)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqClipboardToImage(JNIEnv* env, jclass , jlong dest, jlong palette)
-{
-    int rv = imaqClipboardToImage((Image*)dest, (RGBValue*)palette);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqImageToClipboard(Image image, RGBValue palette)
- * JN: void imaqImageToClipboard(long image, long palette)
- * C: int imaqImageToClipboard(const Image* image, const RGBValue* palette)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqImageToClipboard(JNIEnv* env, jclass , jlong image, jlong palette)
-{
-    int rv = imaqImageToClipboard((const Image*)image, (const RGBValue*)palette);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Border functions
  */
@@ -1949,304 +1621,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWatershedTransform(JNIE
  * Window Management functions
  */
 
-/* J: void imaqAreScrollbarsVisible(int windowNumber)
- * JN: void imaqAreScrollbarsVisible(int windowNumber, long visible)
- * C: int imaqAreScrollbarsVisible(int windowNumber, int* visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqAreScrollbarsVisible(JNIEnv* env, jclass , jint windowNumber, jlong visible)
-{
-    int rv = imaqAreScrollbarsVisible((int)windowNumber, (int*)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqBringWindowToTop(int windowNumber)
- * JN: void imaqBringWindowToTop(int windowNumber)
- * C: int imaqBringWindowToTop(int windowNumber)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqBringWindowToTop(JNIEnv* env, jclass , jint windowNumber)
-{
-    int rv = imaqBringWindowToTop((int)windowNumber);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetMousePos()
- * JN: void imaqGetMousePos(long position, long windowNumber)
- * C: int imaqGetMousePos(Point* position, int* windowNumber)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetMousePos(JNIEnv* env, jclass , jlong position, jlong windowNumber)
-{
-    int rv = imaqGetMousePos((Point*)position, (int*)windowNumber);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowBackground(int windowNumber)
- * JN: void imaqGetWindowBackground(int windowNumber, long fillStyle, long hatchStyle, long fillColor, long backgroundColor)
- * C: int imaqGetWindowBackground(int windowNumber, WindowBackgroundFillStyle* fillStyle, WindowBackgroundHatchStyle* hatchStyle, RGBValue* fillColor, RGBValue* backgroundColor)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowBackground(JNIEnv* env, jclass , jint windowNumber, jlong fillStyle, jlong hatchStyle, jlong fillColor, jlong backgroundColor)
-{
-    int rv = imaqGetWindowBackground((int)windowNumber, (WindowBackgroundFillStyle*)fillStyle, (WindowBackgroundHatchStyle*)hatchStyle, (RGBValue*)fillColor, (RGBValue*)backgroundColor);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowDisplayMapping(int windowNum)
- * JN: void imaqGetWindowDisplayMapping(int windowNum, long mapping)
- * C: int imaqGetWindowDisplayMapping(int windowNum, DisplayMapping* mapping)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowDisplayMapping(JNIEnv* env, jclass , jint windowNum, jlong mapping)
-{
-    int rv = imaqGetWindowDisplayMapping((int)windowNum, (DisplayMapping*)mapping);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowGrid(int windowNumber)
- * JN: void imaqGetWindowGrid(int windowNumber, long xResolution, long yResolution)
- * C: int imaqGetWindowGrid(int windowNumber, int* xResolution, int* yResolution)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowGrid(JNIEnv* env, jclass , jint windowNumber, jlong xResolution, jlong yResolution)
-{
-    int rv = imaqGetWindowGrid((int)windowNumber, (int*)xResolution, (int*)yResolution);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowHandle()
- * JN: void imaqGetWindowHandle(long handle)
- * C: int imaqGetWindowHandle(int* handle)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowHandle(JNIEnv* env, jclass , jlong handle)
-{
-    int rv = imaqGetWindowHandle((int*)handle);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowPos(int windowNumber)
- * JN: void imaqGetWindowPos(int windowNumber, long position)
- * C: int imaqGetWindowPos(int windowNumber, Point* position)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowPos(JNIEnv* env, jclass , jint windowNumber, jlong position)
-{
-    int rv = imaqGetWindowPos((int)windowNumber, (Point*)position);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowSize(int windowNumber)
- * JN: void imaqGetWindowSize(int windowNumber, long width, long height)
- * C: int imaqGetWindowSize(int windowNumber, int* width, int* height)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowSize(JNIEnv* env, jclass , jint windowNumber, jlong width, jlong height)
-{
-    int rv = imaqGetWindowSize((int)windowNumber, (int*)width, (int*)height);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: String imaqGetWindowTitle(int windowNumber)
- * JN: String imaqGetWindowTitle(int windowNumber)
- * C: char* imaqGetWindowTitle(int windowNumber)
- */
-
-JNIEXPORT jstring JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowTitle(JNIEnv* env, jclass , jint windowNumber)
-{
-    char* rv = imaqGetWindowTitle((int)windowNumber);
-    if (!rv) throwJavaException(env);
-    return (jstring)rv;
-}
-
-/* J: void imaqGetWindowZoom2(int windowNumber)
- * JN: void imaqGetWindowZoom2(int windowNumber, long xZoom, long yZoom)
- * C: int imaqGetWindowZoom2(int windowNumber, float* xZoom, float* yZoom)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowZoom2(JNIEnv* env, jclass , jint windowNumber, jlong xZoom, jlong yZoom)
-{
-    int rv = imaqGetWindowZoom2((int)windowNumber, (float*)xZoom, (float*)yZoom);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqIsWindowNonTearing(int windowNumber)
- * JN: void imaqIsWindowNonTearing(int windowNumber, long nonTearing)
- * C: int imaqIsWindowNonTearing(int windowNumber, int* nonTearing)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqIsWindowNonTearing(JNIEnv* env, jclass , jint windowNumber, jlong nonTearing)
-{
-    int rv = imaqIsWindowNonTearing((int)windowNumber, (int*)nonTearing);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqIsWindowVisible(int windowNumber)
- * JN: void imaqIsWindowVisible(int windowNumber, long visible)
- * C: int imaqIsWindowVisible(int windowNumber, int* visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqIsWindowVisible(JNIEnv* env, jclass , jint windowNumber, jlong visible)
-{
-    int rv = imaqIsWindowVisible((int)windowNumber, (int*)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqMoveWindow(int windowNumber, Point position)
- * JN: void imaqMoveWindow(int windowNumber, long position)
- * C: int imaqMoveWindow(int windowNumber, Point position)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqMoveWindow(JNIEnv* env, jclass , jint windowNumber, jlong position)
-{
-    int rv = imaqMoveWindow((int)windowNumber, *((Point*)position));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetupWindow(int windowNumber, int configuration)
- * JN: void imaqSetupWindow(int windowNumber, int configuration)
- * C: int imaqSetupWindow(int windowNumber, int configuration)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetupWindow(JNIEnv* env, jclass , jint windowNumber, jint configuration)
-{
-    int rv = imaqSetupWindow((int)windowNumber, (int)configuration);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowBackground(int windowNumber, WindowBackgroundFillStyle fillStyle, WindowBackgroundHatchStyle hatchStyle, RGBValue fillColor, RGBValue backgroundColor)
- * JN: void imaqSetWindowBackground(int windowNumber, int fillStyle, int hatchStyle, long fillColor, long backgroundColor)
- * C: int imaqSetWindowBackground(int windowNumber, WindowBackgroundFillStyle fillStyle, WindowBackgroundHatchStyle hatchStyle, const RGBValue* fillColor, const RGBValue* backgroundColor)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowBackground(JNIEnv* env, jclass , jint windowNumber, jint fillStyle, jint hatchStyle, jlong fillColor, jlong backgroundColor)
-{
-    int rv = imaqSetWindowBackground((int)windowNumber, (WindowBackgroundFillStyle)fillStyle, (WindowBackgroundHatchStyle)hatchStyle, (const RGBValue*)fillColor, (const RGBValue*)backgroundColor);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowDisplayMapping(int windowNumber, DisplayMapping mapping)
- * JN: void imaqSetWindowDisplayMapping(int windowNumber, long mapping)
- * C: int imaqSetWindowDisplayMapping(int windowNumber, const DisplayMapping* mapping)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowDisplayMapping(JNIEnv* env, jclass , jint windowNumber, jlong mapping)
-{
-    int rv = imaqSetWindowDisplayMapping((int)windowNumber, (const DisplayMapping*)mapping);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowGrid(int windowNumber, int xResolution, int yResolution)
- * JN: void imaqSetWindowGrid(int windowNumber, int xResolution, int yResolution)
- * C: int imaqSetWindowGrid(int windowNumber, int xResolution, int yResolution)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowGrid(JNIEnv* env, jclass , jint windowNumber, jint xResolution, jint yResolution)
-{
-    int rv = imaqSetWindowGrid((int)windowNumber, (int)xResolution, (int)yResolution);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowMaxContourCount(int windowNumber, int maxContourCount)
- * JN: void imaqSetWindowMaxContourCount(int windowNumber, int maxContourCount)
- * C: int imaqSetWindowMaxContourCount(int windowNumber, unsigned int maxContourCount)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowMaxContourCount(JNIEnv* env, jclass , jint windowNumber, jint maxContourCount)
-{
-    int rv = imaqSetWindowMaxContourCount((int)windowNumber, (unsigned int)maxContourCount);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowNonTearing(int windowNumber, int nonTearing)
- * JN: void imaqSetWindowNonTearing(int windowNumber, int nonTearing)
- * C: int imaqSetWindowNonTearing(int windowNumber, int nonTearing)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowNonTearing(JNIEnv* env, jclass , jint windowNumber, jint nonTearing)
-{
-    int rv = imaqSetWindowNonTearing((int)windowNumber, (int)nonTearing);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowPalette(int windowNumber, PaletteType type, RGBValue[] palette)
- * JN: void imaqSetWindowPalette(int windowNumber, int type, long palette, int numColors)
- * C: int imaqSetWindowPalette(int windowNumber, PaletteType type, const RGBValue* palette, int numColors)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowPalette(JNIEnv* env, jclass , jint windowNumber, jint type, jlong palette, jint numColors)
-{
-    int rv = imaqSetWindowPalette((int)windowNumber, (PaletteType)type, (const RGBValue*)palette, (int)numColors);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowSize(int windowNumber, int width, int height)
- * JN: void imaqSetWindowSize(int windowNumber, int width, int height)
- * C: int imaqSetWindowSize(int windowNumber, int width, int height)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowSize(JNIEnv* env, jclass , jint windowNumber, jint width, jint height)
-{
-    int rv = imaqSetWindowSize((int)windowNumber, (int)width, (int)height);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowThreadPolicy(WindowThreadPolicy policy)
- * JN: void imaqSetWindowThreadPolicy(int policy)
- * C: int imaqSetWindowThreadPolicy(WindowThreadPolicy policy)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowThreadPolicy(JNIEnv* env, jclass , jint policy)
-{
-    int rv = imaqSetWindowThreadPolicy((WindowThreadPolicy)policy);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowTitle(int windowNumber, String title)
- * JN: void imaqSetWindowTitle(int windowNumber, long title)
- * C: int imaqSetWindowTitle(int windowNumber, const char* title)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowTitle(JNIEnv* env, jclass , jint windowNumber, jlong title)
-{
-    int rv = imaqSetWindowTitle((int)windowNumber, (const char*)title);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetWindowZoomToFit(int windowNumber, int zoomToFit)
- * JN: void imaqSetWindowZoomToFit(int windowNumber, int zoomToFit)
- * C: int imaqSetWindowZoomToFit(int windowNumber, int zoomToFit)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowZoomToFit(JNIEnv* env, jclass , jint windowNumber, jint zoomToFit)
-{
-    int rv = imaqSetWindowZoomToFit((int)windowNumber, (int)zoomToFit);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqShowScrollbars(int windowNumber, int visible)
- * JN: void imaqShowScrollbars(int windowNumber, int visible)
- * C: int imaqShowScrollbars(int windowNumber, int visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqShowScrollbars(JNIEnv* env, jclass , jint windowNumber, jint visible)
-{
-    int rv = imaqShowScrollbars((int)windowNumber, (int)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqZoomWindow2(int windowNumber, float xZoom, float yZoom, Point center)
- * JN: void imaqZoomWindow2(int windowNumber, float xZoom, float yZoom, long center)
- * C: int imaqZoomWindow2(int windowNumber, float xZoom, float yZoom, Point center)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqZoomWindow2(JNIEnv* env, jclass , jint windowNumber, jfloat xZoom, jfloat yZoom, jlong center)
-{
-    int rv = imaqZoomWindow2((int)windowNumber, (float)xZoom, (float)yZoom, *((Point*)center));
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Utilities functions
  */
@@ -2266,116 +1640,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqMulticoreOptions(JNIEnv
  * Tool Window functions
  */
 
-/* J: void imaqCloseToolWindow()
- * JN: void imaqCloseToolWindow()
- * C: int imaqCloseToolWindow( void)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCloseToolWindow(JNIEnv* env, jclass )
-{
-    int rv = imaqCloseToolWindow();
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetCurrentTool()
- * JN: void imaqGetCurrentTool(long currentTool)
- * C: int imaqGetCurrentTool(Tool* currentTool)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetCurrentTool(JNIEnv* env, jclass , jlong currentTool)
-{
-    int rv = imaqGetCurrentTool((Tool*)currentTool);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetLastEvent()
- * JN: void imaqGetLastEvent(long type, long windowNumber, long tool, long rect)
- * C: int imaqGetLastEvent(WindowEventType* type, int* windowNumber, Tool* tool, Rect* rect)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetLastEvent(JNIEnv* env, jclass , jlong type, jlong windowNumber, jlong tool, jlong rect)
-{
-    int rv = imaqGetLastEvent((WindowEventType*)type, (int*)windowNumber, (Tool*)tool, (Rect*)rect);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetToolWindowPos()
- * JN: void imaqGetToolWindowPos(long position)
- * C: int imaqGetToolWindowPos(Point* position)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetToolWindowPos(JNIEnv* env, jclass , jlong position)
-{
-    int rv = imaqGetToolWindowPos((Point*)position);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqIsToolWindowVisible()
- * JN: void imaqIsToolWindowVisible(long visible)
- * C: int imaqIsToolWindowVisible(int* visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqIsToolWindowVisible(JNIEnv* env, jclass , jlong visible)
-{
-    int rv = imaqIsToolWindowVisible((int*)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqMoveToolWindow(Point position)
- * JN: void imaqMoveToolWindow(long position)
- * C: int imaqMoveToolWindow(Point position)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqMoveToolWindow(JNIEnv* env, jclass , jlong position)
-{
-    int rv = imaqMoveToolWindow(*((Point*)position));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetCurrentTool(Tool currentTool)
- * JN: void imaqSetCurrentTool(int currentTool)
- * C: int imaqSetCurrentTool(Tool currentTool)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetCurrentTool(JNIEnv* env, jclass , jint currentTool)
-{
-    int rv = imaqSetCurrentTool((Tool)currentTool);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetToolColor(RGBValue color)
- * JN: void imaqSetToolColor(long color)
- * C: int imaqSetToolColor(const RGBValue* color)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetToolColor(JNIEnv* env, jclass , jlong color)
-{
-    int rv = imaqSetToolColor((const RGBValue*)color);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSetupToolWindow(int showCoordinates, int maxIconsPerLine, ToolWindowOptions options)
- * JN: void imaqSetupToolWindow(int showCoordinates, int maxIconsPerLine, long options)
- * C: int imaqSetupToolWindow(int showCoordinates, int maxIconsPerLine, const ToolWindowOptions* options)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetupToolWindow(JNIEnv* env, jclass , jint showCoordinates, jint maxIconsPerLine, jlong options)
-{
-    int rv = imaqSetupToolWindow((int)showCoordinates, (int)maxIconsPerLine, (const ToolWindowOptions*)options);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqShowToolWindow(int visible)
- * JN: void imaqShowToolWindow(int visible)
- * C: int imaqShowToolWindow(int visible)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqShowToolWindow(JNIEnv* env, jclass , jint visible)
-{
-    int rv = imaqShowToolWindow((int)visible);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Meter functions
  */
@@ -3025,17 +2289,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetContourColor(JNIEnv*
  * Regions of Interest functions
  */
 
-/* J: void imaqConstructROI2(Image image, ROI roi, Tool initialTool, ToolWindowOptions tools, ConstructROIOptions2 options)
- * JN: void imaqConstructROI2(long image, long roi, int initialTool, long tools, long options, long okay)
- * C: int imaqConstructROI2(const Image* image, ROI* roi, Tool initialTool, const ToolWindowOptions* tools, const ConstructROIOptions2* options, int* okay)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqConstructROI2(JNIEnv* env, jclass , jlong image, jlong roi, jint initialTool, jlong tools, jlong options, jlong okay)
-{
-    int rv = imaqConstructROI2((const Image*)image, (ROI*)roi, (Tool)initialTool, (const ToolWindowOptions*)tools, (const ConstructROIOptions2*)options, (int*)okay);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: ROI imaqCreateROI()
  * JN: long imaqCreateROI()
  * C: ROI* imaqCreateROI( void)
@@ -3070,18 +2323,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetROIColor(JNIEnv* env
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: ROI imaqGetWindowROI(int windowNumber)
- * JN: long imaqGetWindowROI(int windowNumber)
- * C: ROI* imaqGetWindowROI(int windowNumber)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowROI(JNIEnv* env, jclass , jint windowNumber)
-{
-    ROI* rv = imaqGetWindowROI((int)windowNumber);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
 /* J: void imaqSetROIColor(ROI roi, RGBValue color)
  * JN: void imaqSetROIColor(long roi, long color)
  * C: int imaqSetROIColor(ROI* roi, const RGBValue* color)
@@ -3093,17 +2334,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetROIColor(JNIEnv* env
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqSetWindowROI(int windowNumber, ROI roi)
- * JN: void imaqSetWindowROI(int windowNumber, long roi)
- * C: int imaqSetWindowROI(int windowNumber, const ROI* roi)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowROI(JNIEnv* env, jclass , jint windowNumber, jlong roi)
-{
-    int rv = imaqSetWindowROI((int)windowNumber, (const ROI*)roi);
-    if (rv == 0) throwJavaException(env);
-}
-
 /*
  * Image Analysis functions
  */
@@ -3561,17 +2791,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqOverlayLine(JNIEnv* env
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqOverlayMetafile(Image image, RawData metafile, Rect rect, String group)
- * JN: void imaqOverlayMetafile(long image, long metafile, long rect, long group)
- * C: int imaqOverlayMetafile(Image* image, const void* metafile, Rect rect, const char* group)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqOverlayMetafile(JNIEnv* env, jclass , jlong image, jlong metafile, jlong rect, jlong group)
-{
-    int rv = imaqOverlayMetafile((Image*)image, (const void*)metafile, *((Rect*)rect), (const char*)group);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqOverlayOpenContour(Image image, Point[] points, RGBValue color, String group)
  * JN: void imaqOverlayOpenContour(long image, long points, int numPoints, long color, long group)
  * C: int imaqOverlayOpenContour(Image* image, const Point* points, int numPoints, const RGBValue* color, const char* group)
@@ -4327,300 +3546,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqLearnGoldenTemplate(JNI
  * Obsolete functions
  */
 
-/* J: void imaqWritePNGFile(Image image, String fileName, int compressionSpeed, RGBValue colorTable)
- * JN: void imaqWritePNGFile(long image, long fileName, int compressionSpeed, long colorTable)
- * C: int imaqWritePNGFile(const Image* image, const char* fileName, unsigned int compressionSpeed, const RGBValue* colorTable)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqWritePNGFile(JNIEnv* env, jclass , jlong image, jlong fileName, jint compressionSpeed, jlong colorTable)
-{
-    int rv = imaqWritePNGFile((const Image*)image, (const char*)fileName, (unsigned int)compressionSpeed, (const RGBValue*)colorTable);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: SelectParticlesResult imaqSelectParticles(Image image, ParticleReport reports, int reportCount, int rejectBorder, SelectParticleCriteria criteria, int criteriaCount)
- * JN: long imaqSelectParticles(long image, long reports, int reportCount, int rejectBorder, long criteria, int criteriaCount, long selectedCount)
- * C: ParticleReport* imaqSelectParticles(const Image* image, const ParticleReport* reports, int reportCount, int rejectBorder, const SelectParticleCriteria* criteria, int criteriaCount, int* selectedCount)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqSelectParticles(JNIEnv* env, jclass , jlong image, jlong reports, jint reportCount, jint rejectBorder, jlong criteria, jint criteriaCount, jlong selectedCount)
-{
-    ParticleReport* rv = imaqSelectParticles((const Image*)image, (const ParticleReport*)reports, (int)reportCount, (int)rejectBorder, (const SelectParticleCriteria*)criteria, (int)criteriaCount, (int*)selectedCount);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqParticleFilter(Image dest, Image source, ParticleFilterCriteria criteria, int criteriaCount, int rejectMatches, int connectivity8)
- * JN: void imaqParticleFilter(long dest, long source, long criteria, int criteriaCount, int rejectMatches, int connectivity8)
- * C: int imaqParticleFilter(Image* dest, Image* source, const ParticleFilterCriteria* criteria, int criteriaCount, int rejectMatches, int connectivity8)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqParticleFilter(JNIEnv* env, jclass , jlong dest, jlong source, jlong criteria, jint criteriaCount, jint rejectMatches, jint connectivity8)
-{
-    int rv = imaqParticleFilter((Image*)dest, (Image*)source, (const ParticleFilterCriteria*)criteria, (int)criteriaCount, (int)rejectMatches, (int)connectivity8);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: GetParticleInfoResult imaqGetParticleInfo(Image image, int connectivity8, ParticleInfoMode mode)
- * JN: long imaqGetParticleInfo(long image, int connectivity8, int mode, long reportCount)
- * C: ParticleReport* imaqGetParticleInfo(Image* image, int connectivity8, ParticleInfoMode mode, int* reportCount)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGetParticleInfo(JNIEnv* env, jclass , jlong image, jint connectivity8, jint mode, jlong reportCount)
-{
-    ParticleReport* rv = imaqGetParticleInfo((Image*)image, (int)connectivity8, (ParticleInfoMode)mode, (int*)reportCount);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqCalcCoeff(Image image, ParticleReport report, MeasurementValue parameter)
- * JN: void imaqCalcCoeff(long image, long report, int parameter, long coefficient)
- * C: int imaqCalcCoeff(const Image* image, const ParticleReport* report, MeasurementValue parameter, float* coefficient)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCalcCoeff(JNIEnv* env, jclass , jlong image, jlong report, jint parameter, jlong coefficient)
-{
-    int rv = imaqCalcCoeff((const Image*)image, (const ParticleReport*)report, (MeasurementValue)parameter, (float*)coefficient);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: EdgeToolResult imaqEdgeTool(Image image, Point points, int numPoints, EdgeOptions options)
- * JN: long imaqEdgeTool(long image, long points, int numPoints, long options, long numEdges)
- * C: EdgeReport* imaqEdgeTool(const Image* image, const Point* points, int numPoints, const EdgeOptions* options, int* numEdges)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqEdgeTool(JNIEnv* env, jclass , jlong image, jlong points, jint numPoints, jlong options, jlong numEdges)
-{
-    EdgeReport* rv = imaqEdgeTool((const Image*)image, (const Point*)points, (int)numPoints, (const EdgeOptions*)options, (int*)numEdges);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: CirclesResult imaqCircles(Image dest, Image source, float minRadius, float maxRadius)
- * JN: long imaqCircles(long dest, long source, float minRadius, float maxRadius, long numCircles)
- * C: CircleReport* imaqCircles(Image* dest, const Image* source, float minRadius, float maxRadius, int* numCircles)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqCircles(JNIEnv* env, jclass , jlong dest, jlong source, jfloat minRadius, jfloat maxRadius, jlong numCircles)
-{
-    CircleReport* rv = imaqCircles((Image*)dest, (const Image*)source, (float)minRadius, (float)maxRadius, (int*)numCircles);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqLabel(Image dest, Image source, int connectivity8)
- * JN: void imaqLabel(long dest, long source, int connectivity8, long particleCount)
- * C: int imaqLabel(Image* dest, Image* source, int connectivity8, int* particleCount)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqLabel(JNIEnv* env, jclass , jlong dest, jlong source, jint connectivity8, jlong particleCount)
-{
-    int rv = imaqLabel((Image*)dest, (Image*)source, (int)connectivity8, (int*)particleCount);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqFitEllipse(PointFloat[] points)
- * JN: void imaqFitEllipse(long points, int numPoints, long ellipse)
- * C: int imaqFitEllipse(const PointFloat* points, int numPoints, BestEllipse* ellipse)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqFitEllipse(JNIEnv* env, jclass , jlong points, jint numPoints, jlong ellipse)
-{
-    int rv = imaqFitEllipse((const PointFloat*)points, (int)numPoints, (BestEllipse*)ellipse);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqFitCircle(PointFloat[] points)
- * JN: void imaqFitCircle(long points, int numPoints, long circle)
- * C: int imaqFitCircle(const PointFloat* points, int numPoints, BestCircle* circle)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqFitCircle(JNIEnv* env, jclass , jlong points, jint numPoints, jlong circle)
-{
-    int rv = imaqFitCircle((const PointFloat*)points, (int)numPoints, (BestCircle*)circle);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: MatchPatternResult imaqMatchPattern(Image image, Image pattern, MatchPatternOptions options, Rect searchRect)
- * JN: long imaqMatchPattern(long image, long pattern, long options, long searchRect, long numMatches)
- * C: PatternMatch* imaqMatchPattern(const Image* image, Image* pattern, const MatchPatternOptions* options, Rect searchRect, int* numMatches)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqMatchPattern(JNIEnv* env, jclass , jlong image, jlong pattern, jlong options, jlong searchRect, jlong numMatches)
-{
-    PatternMatch* rv = imaqMatchPattern((const Image*)image, (Image*)pattern, (const MatchPatternOptions*)options, *((Rect*)searchRect), (int*)numMatches);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqConvex(Image dest, Image source)
- * JN: void imaqConvex(long dest, long source)
- * C: int imaqConvex(Image* dest, const Image* source)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqConvex(JNIEnv* env, jclass , jlong dest, jlong source)
-{
-    int rv = imaqConvex((Image*)dest, (const Image*)source);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqIsVisionInfoPresent(Image image, VisionInfoType type)
- * JN: void imaqIsVisionInfoPresent(long image, int type, long present)
- * C: int imaqIsVisionInfoPresent(const Image* image, VisionInfoType type, int* present)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqIsVisionInfoPresent(JNIEnv* env, jclass , jlong image, jint type, jlong present)
-{
-    int rv = imaqIsVisionInfoPresent((const Image*)image, (VisionInfoType)type, (int*)present);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqLineGaugeTool(Image image, Point start, Point end, LineGaugeMethod method, EdgeOptions edgeOptions, CoordinateTransform reference)
- * JN: void imaqLineGaugeTool(long image, long start, long end, int method, long edgeOptions, long reference, long distance)
- * C: int imaqLineGaugeTool(const Image* image, Point start, Point end, LineGaugeMethod method, const EdgeOptions* edgeOptions, const CoordinateTransform* reference, float* distance)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqLineGaugeTool(JNIEnv* env, jclass , jlong image, jlong start, jlong end, jint method, jlong edgeOptions, jlong reference, jlong distance)
-{
-    int rv = imaqLineGaugeTool((const Image*)image, *((Point*)start), *((Point*)end), (LineGaugeMethod)method, (const EdgeOptions*)edgeOptions, (const CoordinateTransform*)reference, (float*)distance);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqBestCircle(PointFloat[] points)
- * JN: void imaqBestCircle(long points, int numPoints, long center, long radius)
- * C: int imaqBestCircle(const PointFloat* points, int numPoints, PointFloat* center, double* radius)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqBestCircle(JNIEnv* env, jclass , jlong points, jint numPoints, jlong center, jlong radius)
-{
-    int rv = imaqBestCircle((const PointFloat*)points, (int)numPoints, (PointFloat*)center, (double*)radius);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqSavePattern(Image pattern, String fileName)
- * JN: void imaqSavePattern(long pattern, long fileName)
- * C: int imaqSavePattern(const Image* pattern, const char* fileName)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSavePattern(JNIEnv* env, jclass , jlong pattern, jlong fileName)
-{
-    int rv = imaqSavePattern((const Image*)pattern, (const char*)fileName);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqLoadPattern(Image pattern, String fileName)
- * JN: void imaqLoadPattern(long pattern, long fileName)
- * C: int imaqLoadPattern(Image* pattern, const char* fileName)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqLoadPattern(JNIEnv* env, jclass , jlong pattern, jlong fileName)
-{
-    int rv = imaqLoadPattern((Image*)pattern, (const char*)fileName);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqTransformROI(ROI roi, Point originStart, float angleStart, Point originFinal, float angleFinal)
- * JN: void imaqTransformROI(long roi, long originStart, float angleStart, long originFinal, float angleFinal)
- * C: int imaqTransformROI(ROI* roi, Point originStart, float angleStart, Point originFinal, float angleFinal)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqTransformROI(JNIEnv* env, jclass , jlong roi, jlong originStart, jfloat angleStart, jlong originFinal, jfloat angleFinal)
-{
-    int rv = imaqTransformROI((ROI*)roi, *((Point*)originStart), (float)angleStart, *((Point*)originFinal), (float)angleFinal);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqCoordinateReference(Point points, ReferenceMode mode)
- * JN: void imaqCoordinateReference(long points, int mode, long origin, long angle)
- * C: int imaqCoordinateReference(const Point* points, ReferenceMode mode, Point* origin, float* angle)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCoordinateReference(JNIEnv* env, jclass , jlong points, jint mode, jlong origin, jlong angle)
-{
-    int rv = imaqCoordinateReference((const Point*)points, (ReferenceMode)mode, (Point*)origin, (float*)angle);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: ContourInfo imaqGetContourInfo(ROI roi, int id)
- * JN: long imaqGetContourInfo(long roi, int id)
- * C: ContourInfo* imaqGetContourInfo(const ROI* roi, ContourID id)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGetContourInfo(JNIEnv* env, jclass , jlong roi, jint id)
-{
-    ContourInfo* rv = imaqGetContourInfo((const ROI*)roi, (ContourID)id);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqSetWindowOverlay(int windowNumber, Overlay overlay)
- * JN: void imaqSetWindowOverlay(int windowNumber, long overlay)
- * C: int imaqSetWindowOverlay(int windowNumber, const Overlay* overlay)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetWindowOverlay(JNIEnv* env, jclass , jint windowNumber, jlong overlay)
-{
-    int rv = imaqSetWindowOverlay((int)windowNumber, (const Overlay*)overlay);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: Overlay imaqCreateOverlayFromROI(ROI roi)
- * JN: long imaqCreateOverlayFromROI(long roi)
- * C: Overlay* imaqCreateOverlayFromROI(const ROI* roi)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqCreateOverlayFromROI(JNIEnv* env, jclass , jlong roi)
-{
-    Overlay* rv = imaqCreateOverlayFromROI((const ROI*)roi);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: Overlay imaqCreateOverlayFromMetafile(RawData metafile)
- * JN: long imaqCreateOverlayFromMetafile(long metafile)
- * C: Overlay* imaqCreateOverlayFromMetafile(const void* metafile)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqCreateOverlayFromMetafile(JNIEnv* env, jclass , jlong metafile)
-{
-    Overlay* rv = imaqCreateOverlayFromMetafile((const void*)metafile);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: void imaqSetCalibrationInfo(Image image, CalibrationUnit unit, float xDistance, float yDistance)
- * JN: void imaqSetCalibrationInfo(long image, int unit, float xDistance, float yDistance)
- * C: int imaqSetCalibrationInfo(Image* image, CalibrationUnit unit, float xDistance, float yDistance)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetCalibrationInfo(JNIEnv* env, jclass , jlong image, jint unit, jfloat xDistance, jfloat yDistance)
-{
-    int rv = imaqSetCalibrationInfo((Image*)image, (CalibrationUnit)unit, (float)xDistance, (float)yDistance);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetCalibrationInfo(Image image)
- * JN: void imaqGetCalibrationInfo(long image, long unit, long xDistance, long yDistance)
- * C: int imaqGetCalibrationInfo(const Image* image, CalibrationUnit* unit, float* xDistance, float* yDistance)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetCalibrationInfo(JNIEnv* env, jclass , jlong image, jlong unit, jlong xDistance, jlong yDistance)
-{
-    int rv = imaqGetCalibrationInfo((const Image*)image, (CalibrationUnit*)unit, (float*)xDistance, (float*)yDistance);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqConstructROI(Image image, ROI roi, Tool initialTool, ToolWindowOptions tools, ConstructROIOptions options)
- * JN: void imaqConstructROI(long image, long roi, int initialTool, long tools, long options, long okay)
- * C: int imaqConstructROI(const Image* image, ROI* roi, Tool initialTool, const ToolWindowOptions* tools, const ConstructROIOptions* options, int* okay)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqConstructROI(JNIEnv* env, jclass , jlong image, jlong roi, jint initialTool, jlong tools, jlong options, jlong okay)
-{
-    int rv = imaqConstructROI((const Image*)image, (ROI*)roi, (Tool)initialTool, (const ToolWindowOptions*)tools, (const ConstructROIOptions*)options, (int*)okay);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqGetParticleClassifierOptions(ClassifierSession session)
  * JN: void imaqGetParticleClassifierOptions(long session, long preprocessingOptions, long options)
  * C: int imaqGetParticleClassifierOptions(const ClassifierSession* session, ParticleClassifierPreprocessingOptions* preprocessingOptions, ParticleClassifierOptions* options)
@@ -4632,28 +3557,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetParticleClassifierOp
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqZoomWindow(int windowNumber, int xZoom, int yZoom, Point center)
- * JN: void imaqZoomWindow(int windowNumber, int xZoom, int yZoom, long center)
- * C: int imaqZoomWindow(int windowNumber, int xZoom, int yZoom, Point center)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqZoomWindow(JNIEnv* env, jclass , jint windowNumber, jint xZoom, jint yZoom, jlong center)
-{
-    int rv = imaqZoomWindow((int)windowNumber, (int)xZoom, (int)yZoom, *((Point*)center));
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqGetWindowZoom(int windowNumber)
- * JN: void imaqGetWindowZoom(int windowNumber, long xZoom, long yZoom)
- * C: int imaqGetWindowZoom(int windowNumber, int* xZoom, int* yZoom)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqGetWindowZoom(JNIEnv* env, jclass , jint windowNumber, jlong xZoom, jlong yZoom)
-{
-    int rv = imaqGetWindowZoom((int)windowNumber, (int*)xZoom, (int*)yZoom);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: void imaqParticleFilter3(Image dest, Image source, ParticleFilterCriteria2 criteria, int criteriaCount, ParticleFilterOptions options, ROI roi)
  * JN: void imaqParticleFilter3(long dest, long source, long criteria, int criteriaCount, long options, long roi, long numParticles)
  * C: int imaqParticleFilter3(Image* dest, Image* source, const ParticleFilterCriteria2* criteria, int criteriaCount, const ParticleFilterOptions* options, const ROI* roi, int* numParticles)
@@ -4665,18 +3568,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqParticleFilter3(JNIEnv*
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: ReadTextReport2 imaqReadText2(Image image, CharSet set, ROI roi, ReadTextOptions readOptions, OCRProcessingOptions processingOptions, OCRSpacingOptions spacingOptions)
- * JN: long imaqReadText2(long image, long set, long roi, long readOptions, long processingOptions, long spacingOptions)
- * C: ReadTextReport2* imaqReadText2(const Image* image, const CharSet* set, const ROI* roi, const ReadTextOptions* readOptions, const OCRProcessingOptions* processingOptions, const OCRSpacingOptions* spacingOptions)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqReadText2(JNIEnv* env, jclass , jlong image, jlong set, jlong roi, jlong readOptions, jlong processingOptions, jlong spacingOptions)
-{
-    ReadTextReport2* rv = imaqReadText2((const Image*)image, (const CharSet*)set, (const ROI*)roi, (const ReadTextOptions*)readOptions, (const OCRProcessingOptions*)processingOptions, (const OCRSpacingOptions*)spacingOptions);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
 /* J: void imaqLearnPattern2(Image image, LearningMode learningMode)
  * JN: void imaqLearnPattern2(long image, int learningMode, long advancedOptions)
  * C: int imaqLearnPattern2(Image* image, LearningMode learningMode, LearnPatternAdvancedOptions* advancedOptions)
@@ -4735,17 +3626,6 @@ JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqSpoke(JNIEnv* env, jcl
     return (jlong)rv;
 }
 
-/* J: void imaqLearnPattern(Image image, LearningMode learningMode)
- * JN: void imaqLearnPattern(long image, int learningMode)
- * C: int imaqLearnPattern(Image* image, LearningMode learningMode)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqLearnPattern(JNIEnv* env, jclass , jlong image, jint learningMode)
-{
-    int rv = imaqLearnPattern((Image*)image, (LearningMode)learningMode);
-    if (rv == 0) throwJavaException(env);
-}
-
 /* J: MatchPattern2Result imaqMatchPattern2(Image image, Image pattern, MatchPatternOptions options, MatchPatternAdvancedOptions advancedOptions, Rect searchRect)
  * JN: long imaqMatchPattern2(long image, long pattern, long options, long advancedOptions, long searchRect, long numMatches)
  * C: PatternMatch* imaqMatchPattern2(const Image* image, const Image* pattern, const MatchPatternOptions* options, const MatchPatternAdvancedOptions* advancedOptions, Rect searchRect, int* numMatches)
@@ -4769,136 +3649,6 @@ JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqSetParticleClassifierOp
     if (rv == 0) throwJavaException(env);
 }
 
-/* J: void imaqCopyCalibrationInfo(Image dest, Image source)
- * JN: void imaqCopyCalibrationInfo(long dest, long source)
- * C: int imaqCopyCalibrationInfo(Image* dest, const Image* source)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqCopyCalibrationInfo(JNIEnv* env, jclass , jlong dest, jlong source)
-{
-    int rv = imaqCopyCalibrationInfo((Image*)dest, (const Image*)source);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: void imaqParticleFilter2(Image dest, Image source, ParticleFilterCriteria2[] criteria, int rejectMatches, int connectivity8)
- * JN: void imaqParticleFilter2(long dest, long source, long criteria, int criteriaCount, int rejectMatches, int connectivity8, long numParticles)
- * C: int imaqParticleFilter2(Image* dest, Image* source, const ParticleFilterCriteria2* criteria, int criteriaCount, int rejectMatches, int connectivity8, int* numParticles)
- */
-
-JNIEXPORT void JNICALL Java_com_ni_vision_NIVision__1imaqParticleFilter2(JNIEnv* env, jclass , jlong dest, jlong source, jlong criteria, jint criteriaCount, jint rejectMatches, jint connectivity8, jlong numParticles)
-{
-    int rv = imaqParticleFilter2((Image*)dest, (Image*)source, (const ParticleFilterCriteria2*)criteria, (int)criteriaCount, (int)rejectMatches, (int)connectivity8, (int*)numParticles);
-    if (rv == 0) throwJavaException(env);
-}
-
-/* J: EdgeTool2Result imaqEdgeTool2(Image image, Point points, int numPoints, EdgeProcess process, EdgeOptions options)
- * JN: long imaqEdgeTool2(long image, long points, int numPoints, int process, long options, long numEdges)
- * C: EdgeReport* imaqEdgeTool2(const Image* image, const Point* points, int numPoints, EdgeProcess process, const EdgeOptions* options, int* numEdges)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqEdgeTool2(JNIEnv* env, jclass , jlong image, jlong points, jint numPoints, jint process, jlong options, jlong numEdges)
-{
-    EdgeReport* rv = imaqEdgeTool2((const Image*)image, (const Point*)points, (int)numPoints, (EdgeProcess)process, (const EdgeOptions*)options, (int*)numEdges);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: int imaqAddRotatedRectContour(ROI roi, RotatedRect rect)
- * JN: int imaqAddRotatedRectContour(long roi, long rect)
- * C: ContourID imaqAddRotatedRectContour(ROI* roi, RotatedRect rect)
- */
-
-JNIEXPORT jint JNICALL Java_com_ni_vision_NIVision__1imaqAddRotatedRectContour(JNIEnv* env, jclass , jlong roi, jlong rect)
-{
-    ContourID rv = imaqAddRotatedRectContour((ROI*)roi, *((RotatedRect*)rect));
-    
-    return (jint)rv;
-}
-
-/* J: ReadDataMatrixBarcodeResult imaqReadDataMatrixBarcode(Image image, ROI roi, DataMatrixOptions options)
- * JN: long imaqReadDataMatrixBarcode(long image, long roi, long options, long numBarcodes)
- * C: Barcode2DInfo* imaqReadDataMatrixBarcode(const Image* image, const ROI* roi, const DataMatrixOptions* options, unsigned int* numBarcodes)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqReadDataMatrixBarcode(JNIEnv* env, jclass , jlong image, jlong roi, jlong options, jlong numBarcodes)
-{
-    Barcode2DInfo* rv = imaqReadDataMatrixBarcode((const Image*)image, (const ROI*)roi, (const DataMatrixOptions*)options, (unsigned int*)numBarcodes);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: LinearAverages imaqLinearAverages(Image image, Rect rect)
- * JN: long imaqLinearAverages(long image, long rect)
- * C: LinearAverages* imaqLinearAverages(const Image* image, Rect rect)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqLinearAverages(JNIEnv* env, jclass , jlong image, jlong rect)
-{
-    LinearAverages* rv = imaqLinearAverages((const Image*)image, *((Rect*)rect));
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: MatchGeometricPatternResult imaqMatchGeometricPattern(Image image, Image pattern, CurveOptions curveOptions, MatchGeometricPatternOptions matchOptions, MatchGeometricPatternAdvancedOptions advancedMatchOptions, ROI roi)
- * JN: long imaqMatchGeometricPattern(long image, long pattern, long curveOptions, long matchOptions, long advancedMatchOptions, long roi, long numMatches)
- * C: GeometricPatternMatch* imaqMatchGeometricPattern(const Image* image, const Image* pattern, const CurveOptions* curveOptions, const MatchGeometricPatternOptions* matchOptions, const MatchGeometricPatternAdvancedOptions* advancedMatchOptions, const ROI* roi, int* numMatches)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqMatchGeometricPattern(JNIEnv* env, jclass , jlong image, jlong pattern, jlong curveOptions, jlong matchOptions, jlong advancedMatchOptions, jlong roi, jlong numMatches)
-{
-    GeometricPatternMatch* rv = imaqMatchGeometricPattern((const Image*)image, (const Image*)pattern, (const CurveOptions*)curveOptions, (const MatchGeometricPatternOptions*)matchOptions, (const MatchGeometricPatternAdvancedOptions*)advancedMatchOptions, (const ROI*)roi, (int*)numMatches);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: CharInfo imaqGetCharInfo(CharSet set, int index)
- * JN: long imaqGetCharInfo(long set, int index)
- * C: CharInfo* imaqGetCharInfo(const CharSet* set, int index)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqGetCharInfo(JNIEnv* env, jclass , jlong set, jint index)
-{
-    CharInfo* rv = imaqGetCharInfo((const CharSet*)set, (int)index);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: ReadTextReport imaqReadText(Image image, CharSet set, ROI roi, ReadTextOptions readOptions, OCRProcessingOptions processingOptions, OCRSpacingOptions spacingOptions)
- * JN: long imaqReadText(long image, long set, long roi, long readOptions, long processingOptions, long spacingOptions)
- * C: ReadTextReport* imaqReadText(const Image* image, const CharSet* set, const ROI* roi, const ReadTextOptions* readOptions, const OCRProcessingOptions* processingOptions, const OCRSpacingOptions* spacingOptions)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqReadText(JNIEnv* env, jclass , jlong image, jlong set, jlong roi, jlong readOptions, jlong processingOptions, jlong spacingOptions)
-{
-    ReadTextReport* rv = imaqReadText((const Image*)image, (const CharSet*)set, (const ROI*)roi, (const ReadTextOptions*)readOptions, (const OCRProcessingOptions*)processingOptions, (const OCRSpacingOptions*)spacingOptions);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: ThresholdData imaqAutoThreshold(Image dest, Image source, int numClasses, ThresholdMethod method)
- * JN: long imaqAutoThreshold(long dest, long source, int numClasses, int method)
- * C: ThresholdData* imaqAutoThreshold(Image* dest, Image* source, int numClasses, ThresholdMethod method)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqAutoThreshold(JNIEnv* env, jclass , jlong dest, jlong source, jint numClasses, jint method)
-{
-    ThresholdData* rv = imaqAutoThreshold((Image*)dest, (Image*)source, (int)numClasses, (ThresholdMethod)method);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
-/* J: ColorHistogramReport imaqColorHistogram(Image image, int numClasses, ColorMode mode, Image mask)
- * JN: long imaqColorHistogram(long image, int numClasses, int mode, long mask)
- * C: ColorHistogramReport* imaqColorHistogram(Image* image, int numClasses, ColorMode mode, const Image* mask)
- */
-
-JNIEXPORT jlong JNICALL Java_com_ni_vision_NIVision__1imaqColorHistogram(JNIEnv* env, jclass , jlong image, jint numClasses, jint mode, jlong mask)
-{
-    ColorHistogramReport* rv = imaqColorHistogram((Image*)image, (int)numClasses, (ColorMode)mode, (const Image*)mask);
-    if (!rv) throwJavaException(env);
-    return (jlong)rv;
-}
-
 /* J: RakeReport imaqRake(Image image, ROI roi, RakeDirection direction, EdgeProcess process, RakeOptions options)
  * JN: long imaqRake(long image, long roi, int direction, int process, long options)
  * C: RakeReport* imaqRake(const Image* image, const ROI* roi, RakeDirection direction, EdgeProcess process, const RakeOptions* options)
diff --git a/wpilibj/wpilibJavaJNI/nivision/dxattr_funcs.txt b/wpilibj/wpilibJavaJNI/nivision/dxattr_funcs.txt
new file mode 100644
index 0000000000..a685381056
--- /dev/null
+++ b/wpilibj/wpilibJavaJNI/nivision/dxattr_funcs.txt
@@ -0,0 +1,21 @@
+IMAQdxGetAttributeU32
+IMAQdxGetAttributeI64
+IMAQdxGetAttributeF64
+IMAQdxGetAttributeString
+IMAQdxGetAttributeEnum
+IMAQdxGetAttributeBool
+IMAQdxGetAttributeMinimumU32
+IMAQdxGetAttributeMinimumI64
+IMAQdxGetAttributeMinimumF64
+IMAQdxGetAttributeMaximumU32
+IMAQdxGetAttributeMaximumI64
+IMAQdxGetAttributeMaximumF64
+IMAQdxGetAttributeIncrementU32
+IMAQdxGetAttributeIncrementI64
+IMAQdxGetAttributeIncrementF64
+IMAQdxSetAttributeU32
+IMAQdxSetAttributeI64
+IMAQdxSetAttributeF64
+IMAQdxSetAttributeString
+IMAQdxSetAttributeEnum
+IMAQdxSetAttributeBool
diff --git a/wpilibj/wpilibJavaJNI/nivision/gen_java.py b/wpilibj/wpilibJavaJNI/nivision/gen_java.py
index f3d0beff9c..6361477870 100644
--- a/wpilibj/wpilibJavaJNI/nivision/gen_java.py
+++ b/wpilibj/wpilibJavaJNI/nivision/gen_java.py
@@ -843,10 +843,11 @@ for (int i=0, off={foffset}; i<%s; i++, off += {struct_sz})
 
 
 class JavaEmitter:
-    def __init__(self, outdir, config, config_struct):
+    def __init__(self, outdir, config, config_struct, library_funcs):
         self.outdir = outdir
         self.config = config
         self.config_struct = config_struct
+        self.library_funcs = library_funcs
         self.package = "com.ni.vision"
         self.classname = "NIVision"
         self.classpath = self.package.replace(".", "/") + "/" + self.classname
@@ -930,21 +931,29 @@ public class {classname} {{
     }}
 
     public static ByteBuffer sliceByteBuffer(ByteBuffer bb, int offset, int size) {{
-        ByteBuffer new_bb = bb.duplicate().order(ByteOrder.nativeOrder());
-        new_bb.position(offset);
-        new_bb.limit(size);
+        int pos = bb.position();
+        int lim = bb.limit();
+        bb.position(offset);
+        bb.limit(offset+size);
+        ByteBuffer new_bb = bb.slice().order(ByteOrder.nativeOrder());
+        bb.position(pos);
+        bb.limit(lim);
         return new_bb;
     }}
 
     public static ByteBuffer getBytes(ByteBuffer bb, byte[] dst, int offset, int size) {{
-        for (int i=offset; i<offset+size; i++)
-            dst[i] = bb.get(i);
+        int pos = bb.position();
+        bb.position(offset);
+        bb.get(dst, 0, size);
+        bb.position(pos);
         return bb;
     }}
 
     public static ByteBuffer putBytes(ByteBuffer bb, byte[] src, int offset, int size) {{
-        for (int i=offset; i<offset+size; i++)
-            bb.put(i, src[i]);
+        int pos = bb.position();
+        bb.position(offset);
+        bb.put(src, 0, size);
+        bb.position(pos);
         return bb;
     }}
 
@@ -1462,6 +1471,8 @@ static const char* getErrorText(int err) {{
         raise NotImplementedError("typedef function not implemented")
 
     def function(self, name, restype, params):
+        if name not in self.library_funcs:
+            return
         if name == "IMAQdxEnumerateVideoModes":
             # full custom code
             print("""
@@ -1921,7 +1932,7 @@ JNIEXPORT {rettype} JNICALL Java_{package}_{classname}__1{name}({args})
 def generate(srcdir, outdir, inputs):
     emit = None
 
-    for fname, config_struct_path, configpath in inputs:
+    for fname, config_struct_path, configpath, funcs_path in inputs:
         # read config files
         config_struct = configparser.ConfigParser()
         config_struct.read(config_struct_path)
@@ -1930,6 +1941,11 @@ def generate(srcdir, outdir, inputs):
         block_comment_exclude = set(x.strip() for x in
                 config.get("Block Comment", "exclude").splitlines())
 
+        library_funcs = set()
+        with open(funcs_path) as ff:
+            for line in ff:
+                library_funcs.add(line.strip())
+
         # open input file
         with open(fname) as inf:
             # prescan for undefined structures
@@ -1937,10 +1953,11 @@ def generate(srcdir, outdir, inputs):
             inf.seek(0)
 
             if emit is None:
-                emit = JavaEmitter(outdir, config, config_struct)
+                emit = JavaEmitter(outdir, config, config_struct, library_funcs)
             else:
                 emit.config = config
                 emit.config_struct = config_struct
+                emit.library_funcs = library_funcs
 
             # generate
             parse_file(emit, inf, block_comment_exclude)
@@ -1948,15 +1965,16 @@ def generate(srcdir, outdir, inputs):
     emit.finish()
 
 if __name__ == "__main__":
-    if len(sys.argv) < 4 or ((len(sys.argv)-1) % 3) != 0:
-        print("Usage: gen_wrap.py <header.h config_struct.ini config.ini>...")
+    if len(sys.argv) < 5 or ((len(sys.argv)-1) % 4) != 0:
+        print("Usage: gen_wrap.py <header.h config_struct.ini config.ini funcs.txt>...")
         exit(0)
 
     inputs = []
-    for i in range(1, len(sys.argv), 3):
+    for i in range(1, len(sys.argv), 4):
         fname = sys.argv[i]
         config_struct_name = sys.argv[i+1]
         configname = sys.argv[i+2]
-        inputs.append((fname, config_struct_name, configname))
+        funcs_name = sys.argv[i+3]
+        inputs.append((fname, config_struct_name, configname, funcs_name))
 
     generate("", "", inputs)
diff --git a/wpilibj/wpilibJavaJNI/nivision/generateJNI.sh b/wpilibj/wpilibJavaJNI/nivision/generateJNI.sh
index 6d4791a45f..3f92311586 100755
--- a/wpilibj/wpilibJavaJNI/nivision/generateJNI.sh
+++ b/wpilibj/wpilibJavaJNI/nivision/generateJNI.sh
@@ -13,18 +13,28 @@ python gen_struct_sizer.py ../../../wpilibc/wpilibC++Devices/include/NIIMAQdx.h
 arm-frc-linux-gnueabi-gcc -I../../../wpilibc/wpilibC++Devices/include -S struct_sizer.c
 cat struct_sizer.s | python get_struct_size.py > imaqdx_arm.ini
 
+# Get functions actually in the .so; some functions are in the header but
+# not the shared library!
+arm-frc-linux-gnueabi-nm -D ../../../ni-libraries/libnivision.so.14.0.0 | cut -c 12- | grep ^imaq > nivision_funcs.txt
+echo Priv_ReadJPEGString_C >> nivision_funcs.txt
+arm-frc-linux-gnueabi-nm -D ../../../ni-libraries/libniimaqdx.so.14.0.0 | cut -c 12- | grep ^IMAQdx > imaqdx_funcs.txt
+
 # Run python generator.
 python gen_java.py \
     ../../../wpilibc/wpilibC++Devices/include/nivision.h \
     nivision_arm.ini \
     nivision_2011.ini \
+    nivision_funcs.txt \
     \
     ../../../wpilibc/wpilibC++Devices/include/NIIMAQdx.h \
     imaqdx_arm.ini \
     imaqdx.ini \
+    imaqdx_funcs.txt \
+    \
     dxattr.h \
     imaqdx_arm.ini \
-    dxattr.ini
+    dxattr.ini \
+    dxattr_funcs.txt
 
 # Stick generated files into appropriate places.
 cp NIVision.cpp ../lib/NIVisionJNI.cpp