Merge lp:~yolanda.robla/ubuntu/saucy/sikuli/debian_merge into lp:ubuntu/saucy/sikuli

[Yolanda Robla]

Merging from latest Debian version

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2012-12-07 22:13:08 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-executable-wrappers.patch
-native.patch
-use-java-libs-from-debian.patch
-install-extension.patch
-fix-cmake-sikuli-ide.patch
-tess3.patch
-tessdata.patch
-gcc-4.7.patch
-no-opencv-surf-module.patch
-jgoodies-1.6-compat.patch
 
=== removed directory '.pc/executable-wrappers.patch'
=== removed directory '.pc/executable-wrappers.patch/sikuli-ide'
=== removed directory '.pc/executable-wrappers.patch/sikuli-ide/target'
=== removed directory '.pc/executable-wrappers.patch/sikuli-ide/target/linux'
=== removed directory '.pc/executable-wrappers.patch/sikuli-ide/target/linux/Sikuli-IDE'
=== removed file '.pc/executable-wrappers.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh'
--- .pc/executable-wrappers.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2011-04-16 00:23:53 +0000
+++ .pc/executable-wrappers.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=`dirname $0`
-LC_NUMERIC=C java -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -jar $DIR/sikuli-ide.jar $*
 
=== removed directory '.pc/executable-wrappers.patch/sikuli-script'
=== removed directory '.pc/executable-wrappers.patch/sikuli-script/target'
=== removed file '.pc/executable-wrappers.patch/sikuli-script/target/sikuli-script.sh'
--- .pc/executable-wrappers.patch/sikuli-script/target/sikuli-script.sh	2011-01-24 01:07:30 +0000
+++ .pc/executable-wrappers.patch/sikuli-script/target/sikuli-script.sh	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar sikuli-script.jar $@
 
=== removed directory '.pc/fix-cmake-sikuli-ide.patch'
=== removed directory '.pc/fix-cmake-sikuli-ide.patch/sikuli-ide'
=== removed file '.pc/fix-cmake-sikuli-ide.patch/sikuli-ide/CMakeLists.txt'
--- .pc/fix-cmake-sikuli-ide.patch/sikuli-ide/CMakeLists.txt	2011-10-04 23:32:13 +0000
+++ .pc/fix-cmake-sikuli-ide.patch/sikuli-ide/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,403 +0,0 @@
-# Copyright 2010-2011, Sikuli.org
-# Released under the MIT License.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT (sikuli-ide Java)
-
-SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules")
-INCLUDE(${CMAKE_MODULE_PATH}/common.cmake)
-INCLUDE(${CMAKE_MODULE_PATH}/detect_osx_ver.cmake)
-INCLUDE(${CMAKE_MODULE_PATH}/find_dep_libs.cmake)
-
-
-ENABLE_TESTING()
-
-SET(CMAKE_VERBOSE_MAKEFILE 0)
-
-FIND_PACKAGE(Java 1.6 REQUIRED)
-SET( NON_NATIVE_TARGET TRUE)
-
-IF(UNIX)
-   SET(SEP ":")
-ELSE()
-   SET(SEP ";")
-ENDIF()
-
-
-SET(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-SET(JAVA_SRC_DIR "${BASE_DIR}/src/main/java")
-SET(NATIVE_SRC_DIR "${BASE_DIR}/src/main/native")
-SET(COMMON_LIB_DIR "${BASE_DIR}/../lib")
-SET(INCLUDE_LIB_DIR "${BASE_DIR}/lib")
-SET(BINARY_DIR "${BASE_DIR}/target")
-SET(BINARY_CLASS_DIR "${BINARY_DIR}/classes")
-SET(BINARY_LIB_DIR "${BINARY_DIR}/lib")
-SET(JAR_DIR "${BINARY_DIR}/jar")
-SET(RESOURCE_DIR "${BASE_DIR}/resources")
-SET(RELEASE_DIR "${BASE_DIR}/../release")
-
-SET(JAVA_TEST_DIR "${BASE_DIR}/src/test/java")
-SET(TEST_RESOURCE_DIR "test-res")
-SET(JAVA_TEST_FOR_HUDSON_XML "../hudson-test.xml")
-SET(TEST_CLASS_DIR "${CMAKE_BINARY_DIR}/test") 
-
-SET(SIKULI_SCRIPT_JAR "${COMMON_LIB_DIR}/sikuli-script.jar")
-SET(JUNIT_JAR "/usr/share/java/junit.jar")
-SET(SWING_LAYOUT_JAR "/usr/share/java/swing-layout.jar")
-SET(COMMONS_CLI_JAR "/usr/share/java/commons-cli.jar")
-SET(JSON_SIMPLE_JAR "/usr/share/java/json_simple.jar")
-SET(SWINGX_JAR "/usr/share/java/swingx-core.jar")
-SET(MAC_WIDGETS_JAR "/usr/share/java/mac_widgets.jar")
-SET(FORMS_JAR "/usr/share/java/forms.jar")
-
-
-FILE(MAKE_DIRECTORY ${BINARY_DIR})
-FILE(MAKE_DIRECTORY ${BINARY_CLASS_DIR})
-FILE(MAKE_DIRECTORY ${JAR_DIR})
-FILE(MAKE_DIRECTORY ${TEST_CLASS_DIR})
-
-## Sikuli IDE
-
-SET(MAIN_CLASS org.sikuli.ide.SikuliIDE)
-SET(RUN_USER_ARGS -Dsikuli.console=true -Dfile.encoding=UTF-8 
-             -Dsikuli.testing=yes
-             -Xms64m -Xmx512m 
-   CACHE STRING 
-   "The arguments for running Sikuli IDE with 'make run-user'"
-)
-SET(RUN_ARGS -Dsikuli.console=false -Dsikuli.Debug=3 -Dfile.encoding=UTF-8 
-             -Dsikuli.testing=yes
-             -Xms64m -Xmx512m 
-             #-Duser.language=zh -Duser.region=TW 
-   CACHE STRING 
-   "The arguments for running Sikuli IDE with 'make run'"
-)
-IF(APPLE)
-   LIST(APPEND RUN_ARGS -Xdock:name='Sikuli IDE') 
-ENDIF()
-
-#SET(ARGS -s -r ../sample-scripts/mod1.sikuli --args a1 a2) # example args
-SET(ARGS "")
-
-SET(CLASSPATH 
-   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}/usr/share/java/jython.jar
-)
-
-SET(JAR_FILE sikuli-ide.jar)
-SET(RESOURCES icons META-INF scripts i18n)
-
-IF(LINUX)
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-linux.MF)
-   #SET(CLASSPATH ${CLASSPATH}${SEP}${JXGRABKEY_JAR})
-ELSEIF(WIN32)
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-win32.MF)
-   #SET(CLASSPATH ${CLASSPATH}${SEP}${JINTELLITYPE_JAR})
-ELSE()
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST.MF)
-ENDIF()
-
-
-add_custom_target( ${JAR_FILE} 
-   COMMAND ${JAVA_ARCHIVE} cfm ${BINARY_DIR}/${JAR_FILE}
-           ${MANIFEST} -C ${JAR_DIR} *
-   COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/${JAR_FILE} ${COMMON_LIB_DIR}/${JAR_FILE}
-   COMMENT "Packaging ${JAR_FILE}"
-   WORKING_DIRECTORY ${JAR_DIR}
-)
-
-add_custom_target( ${JAR_FILE}.resources
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${RESOURCE_DIR} ${JAR_DIR}
-   COMMENT "Copying IDE resources"
-)
-
-add_custom_target( ${JAR_FILE}.prepare
-   COMMENT "Preparing ${JAR_FILE}"
-)
-
-add_custom_target( run-user
-   COMMAND ${JAVA_RUNTIME} ${RUN_USER_ARGS} 
-                        -classpath "${CLASSPATH}${SEP}${JAR_DIR}"
-                        ${MAIN_CLASS} ${ARGS}
-)
-
-add_custom_target( run
-   COMMAND ${JAVA_RUNTIME} ${RUN_ARGS} 
-                        -classpath "${CLASSPATH}${SEP}${JAR_DIR}"
-                        ${MAIN_CLASS} ${ARGS}
-)
-
-if(NOT DEFINED SIKULI_VERSION OR SIKULI_VERSION STREQUAL "")
-   file(READ ${BASE_DIR}/latest-ver SIKULI_VERSION)
-   STRING(STRIP ${SIKULI_VERSION} SIKULI_VERSION)
-ENDIF()
-message("Sikuli Version ${SIKULI_VERSION}")
-
-SET(JYTHON_CLASS org.python.util.jython)
-add_custom_target( update-version
-      COMMAND ${JAVA_RUNTIME} -cp "${CLASSPATH}" ${JYTHON_CLASS} ${BASE_DIR}/../utils/update-version.py  ${JAVA_SRC_DIR}/org/sikuli/ide/IDESettings.java "${SIKULI_VERSION}"
-   COMMENT "Update version number in Sikuli-IDE"
-)
-
-SET(INCLUDE_JARS ${SIKULI_SCRIPT_JAR} ${JUNIT_JAR} 
-                 ${SWING_LAYOUT_JAR} ${COMMONS_CLI_JAR}
-                 ${BINARY_DIR}/${JAR_FILE} ${JSON_SIMPLE_JAR}
-                 ${SWINGX_JAR} ${MAC_WIDGETS_JAR} ${FORMS_JAR}
-)
-
-## Windows Package
-
-IF(WIN32)
-   SET(OS "win32")
-   SET(APP_FILE "Sikuli-IDE")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE})
-   SET(FRAMEWORKS_IN_APP_DIR  ${JAR_IN_APP_DIR}/libs)
-   SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
-
-   #LIST(APPEND INCLUDE_JARS ${JINTELLITYPE_JAR})
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.dll")
-   SET(jnilibs ${sikuli_script_jnilibs})
-ENDIF()
-
-## Linux Package
-
-IF(LINUX)
-   SET(OS "linux")
-   SET(APP_FILE "Sikuli-IDE")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE})
-   SET(FRAMEWORKS_IN_APP_DIR  ${JAR_IN_APP_DIR}/libs)
-   SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
-
-   #LIST(APPEND INCLUDE_JARS ${JXGRABKEY_JAR})
-   SET(jnilibs "")
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.so")
-   LIST(APPEND jnilibs ${sikuli_script_jnilibs})
-ENDIF(LINUX)
-
-## Sikuli-IDE.App for Mac OS X
-
-IF(APPLE)
-   IF(APPLE_SNOW_LEOPARD)
-      SET(OSX_VER "osx-10.6")
-   ELSEIF(APPLE_LEOPARD)
-      SET(OSX_VER "osx-10.5")
-   ENDIF()
-   SET(OS ${OSX_VER})
-
-   SET(APP_FILE  "Sikuli-IDE.app")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE}/Contents/Resources/Java)
-   SET(FRAMEWORKS_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE}/Contents/Frameworks)
-
-   FIND_PACKAGE(OpenCV REQUIRED)
-   #message("opencv lib: ${OpenCV_LIB_DIR}")
-   LIST(APPEND CMAKE_LIBRARY_PATH ${OpenCV_LIB_DIR})
-
-   FILE(GLOB jnilibs "${BINARY_LIB_DIR}/*.jnilib")
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.jnilib")
-   LIST(APPEND jnilibs ${sikuli_script_jnilibs})
-
-   find_dep_libs("${jnilibs}" deplibs)
-   find_dep_libs("${deplibs}" deplibs)
-   #MESSAGE("Dep: ${deplibs}")
-
-ENDIF(APPLE)
-
-SET(RELEASE_FILE "Sikuli-${SIKULI_VERSION}-${OS}")
-
-## Packaging App
-add_custom_target( ${APP_FILE}
-   COMMENT "Generate ${BINARY_DIR}/${APP_FILE}"
-)
-
-add_dependencies( ${APP_FILE} ${JAR_FILE} )
-
-IF(LINUX)
-   EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE SYSTEM_ARCH)
-   SET(RELEASE_FILE "${RELEASE_FILE}-${SYSTEM_ARCH}")
-   if(SYSTEM_ARCH MATCHES "x86_64")
-      SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jxgrabkey/lib/libJXGrabKey-64.so")
-   else()
-      SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jxgrabkey/lib/libJXGrabKey-32.so")
-   endif()
-
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp ${jnilibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMENT "Packaging Frameworks in App"
-   )
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) 
-
-ENDIF(LINUX)
-
-IF(WIN32)
-   SET(APP_FILES Sikuli-IDE-w.bat Sikuli-IDE.bat Sikuli-IDE.exe ide-icon.ico)
-   SET(WIN32_LIBS ${COMMON_LIB_DIR}/win32)
-   SET(OPENCV_LIBS cv210 cvaux210 cxcore210 highgui210 ml210)
-
-   SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jintellitype-1.3.6/JIntellitype.dll")
-   add_custom_target( ${JAR_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${JAR_LIB_DIR}
-      #COMMAND ${CMAKE_COMMAND} -E copy ${LIB_GRABKEY} ${JAR_LIB_DIR}/
-      COMMENT "Packaging Frameworks in Jar"
-   )
-   add_dependencies( ${JAR_FILE} ${JAR_FILE}.framework ) 
-
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${WIN32_LIBS} ${FRAMEWORKS_IN_APP_DIR}
-      COMMENT "Packaging Frameworks in App"
-   )
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) 
-
-   #libs
-
-   install(FILES ${jnilibs}
-           DESTINATION ${FRAMEWORKS_IN_APP_DIR})
-   FOREACH(F ${OPENCV_LIBS})
-      install(FILES ${OpenCV_DIR}/bin/${F}.dll
-              DESTINATION ${FRAMEWORKS_IN_APP_DIR})
-   ENDFOREACH()
-
-   FOREACH(F ${APP_FILES})
-      install(FILES ${BINARY_APP_DIR}/${F}
-              DESTINATION ${JAR_IN_APP_DIR})
-
-   ENDFOREACH()
-ENDIF(WIN32)
-
-IF(APPLE)
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp -f ${jnilibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp -f ${deplibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${FRAMEWORKS_IN_APP_DIR} ./change-lib-path.sh
-      COMMENT "Packaging Frameworks"
-   )
-
-   add_custom_target( ${APP_FILE}.update_ver
-	COMMAND defaults write ${BINARY_APP_DIR}/${APP_FILE}/Contents/Info CFBundleVersion `echo ${SIKULI_VERSION} | awk '{print $$1}'`
-	COMMAND plutil -convert xml1 ${BINARY_APP_DIR}/${APP_FILE}/Contents/Info.plist
-   )
-
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ${APP_FILE}.update_ver)
-
-ENDIF(APPLE)
-
-install(DIRECTORY ${BINARY_APP_DIR}/${APP_FILE}
-   USE_SOURCE_PERMISSIONS
-   DESTINATION .
-)
-
-
-add_custom_target( app ALL
-)
-
-
-FOREACH(JAR ${INCLUDE_JARS})
-   get_filename_component(JAR_FILENAME ${JAR} NAME)
-   get_filename_component(target ${JAR} NAME_WE)
-   set(target "include_${target}")
-   add_custom_target( ${target}
-      COMMAND ${CMAKE_COMMAND} -E copy ${JAR} ${JAR_IN_APP_DIR}/${JAR_FILENAME}
-                  
-      COMMENT "Copying ${JAR_FILENAME}"
-   )
-   add_dependencies( ${APP_FILE} ${target} )
-ENDFOREACH(JAR ${INCLUDE_JARS})
-
-
-add_dependencies( app ${APP_FILE})
-
-## Language files
-
-add_custom_target( update-po
-   COMMAND prop2po ${RESOURCE_DIR}/i18n/IDE_en_US.properties > ${RESOURCE_DIR}/i18n/IDE/IDE.pot
-               
-   COMMENT "Update the IDE.pot file"
-)
-
-add_custom_target( update-prop
-   COMMAND ${BASE_DIR}/../utils/update-prop.sh ${RESOURCE_DIR}
-   COMMENT "Update the IDE language properties."
-)
-
-
-## Packaging
-
-if(APPLE)
-      SET(CPACK_GENERATOR DragNDrop )
-      #   SET(CPACK_GENERATOR ZIP )
-else(APPLE)
-   SET(CPACK_GENERATOR 
-      ZIP
-   )
-endif(APPLE)
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sikuli ${SIKULI_VERSION}")
-SET(CPACK_PACKAGE_VENDOR "Sikuli Development Team")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${BASE_DIR}/../readme.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${BASE_DIR}/../copyright.txt")
-SET(CPACK_PACKAGE_FILE_NAME ${RELEASE_FILE})
-
-INCLUDE(CPack)
-
-install(FILES 
-   ${CPACK_PACKAGE_DESCRIPTION_FILE}
-   ${CPACK_RESOURCE_FILE_LICENSE}
-   DESTINATION .
-)
-
-# type "make package" to generate release packages
-
-
-## tests
-
-SET(MAIN_TEST_SUITE ${PACKAGE}.SikuliIDETestSuite)
-
-add_custom_target( java-test.test-res
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${BASE_DIR}/${TEST_RESOURCE_DIR} ${CMAKE_BINARY_DIR}/${TEST_RESOURCE_DIR}
-   COMMENT "Copy test resource"
-)
-
-add_custom_target( java-test
-   #   COMMAND ${JAVA_RUNTIME} -cp ${TEST_CLASS_DIR}${SEP}${BINARY_DIR}/${JAR_FILE}${SEP}${JUNIT_JAR} junit.textui.TestRunner ${MAIN_TEST_SUITE}
-   COMMAND ant -f ${JAVA_TEST_FOR_HUDSON_XML}
-   COMMENT "Run Java unit tests"
-)
-
-add_dependencies( java-test
-        ${JAR_FILE}
-        ${PROJECT_NAME}.test.classes
-        java-test.test-res
-)
-
-add_custom_target( all-test
-)
-
-add_dependencies( all-test
-   java-test   
-)
-
-## Dependencies
-
-add_dependencies( ${JAR_FILE}.prepare
-        ${JAR_FILE}.resources
-        ${JAR_FILE}.classes-in-jar 
-        #        ${JAR_FILE}.libs-in-jar
-)
-
-add_dependencies( ${JAR_FILE} ${JAR_FILE}.prepare )
-add_dependencies( run-user ${JAR_FILE})
-add_dependencies( run ${JAR_FILE})
-add_dependencies( app ${APP_FILE}) 
-
-
-ADD_SUBDIRECTORY( ${JAVA_SRC_DIR} )
-#ADD_SUBDIRECTORY( ${NATIVE_SRC_DIR} )
-ADD_SUBDIRECTORY( ${JAVA_TEST_DIR} )
-
-
-
-SET(SIKULI_VERSION  CACHE INTERNAL "" FORCE)
-
 
=== removed directory '.pc/gcc-4.7.patch'
=== removed directory '.pc/gcc-4.7.patch/sikuli-script'
=== removed directory '.pc/gcc-4.7.patch/sikuli-script/src'
=== removed directory '.pc/gcc-4.7.patch/sikuli-script/src/main'
=== removed directory '.pc/gcc-4.7.patch/sikuli-script/src/main/native'
=== removed file '.pc/gcc-4.7.patch/sikuli-script/src/main/native/sikuli-debug.h'
--- .pc/gcc-4.7.patch/sikuli-script/src/main/native/sikuli-debug.h	2012-05-11 23:51:05 +0000
+++ .pc/gcc-4.7.patch/sikuli-script/src/main/native/sikuli-debug.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-#ifndef _SIKULU_DEBUG_H
-#define _SIKULI_DEBUG_H
-
-
-#include <streambuf>
-#include <ostream>
-
-namespace sikuli{
-   enum DebugCategories {
-      OCR, FINDER
-   };
-   void setDebug(DebugCategories cat, int level);
-
-   extern int OCR_DEBUG_LEVEL;
-   extern int FINDER_DEBUG_LEVEL;
-
-   template <class cT, class traits = std::char_traits<cT> > 
-     class basic_nullbuf: public std::basic_streambuf<cT, traits> { 
-        typename traits::int_type overflow(typename traits::int_type c) 
-        { 
-           return traits::not_eof(c); // indicate success 
-        } 
-     }; 
-
-   template <class cT, class traits = std::char_traits<cT> > 
-     class basic_onullstream: public std::basic_ostream<cT, traits> { 
-     public: 
-        basic_onullstream(): 
-           std::basic_ios<cT, traits>(&m_sbuf), 
-           std::basic_ostream<cT, traits>(&m_sbuf) 
-        { 
-           init(&m_sbuf); 
-        } 
-
-     private: 
-        basic_nullbuf<cT, traits> m_sbuf; 
-     }; 
-
-   typedef basic_onullstream<char> onullstream; 
-   typedef basic_onullstream<wchar_t> wonullstream; 
-
-   std::ostream& dout(const char* name="");
-   std::ostream& dhead(const char* name);
-
-}
-
-#endif
 
=== removed directory '.pc/install-extension.patch'
=== removed directory '.pc/install-extension.patch/sikuli-script'
=== removed directory '.pc/install-extension.patch/sikuli-script/src'
=== removed directory '.pc/install-extension.patch/sikuli-script/src/main'
=== removed directory '.pc/install-extension.patch/sikuli-script/src/main/java'
=== removed directory '.pc/install-extension.patch/sikuli-script/src/main/java/org'
=== removed directory '.pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli'
=== removed directory '.pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli/script'
=== removed file '.pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java'
--- .pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java	2011-10-04 00:57:09 +0000
+++ .pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.script;
-
-import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
-
-class Extension implements Serializable{
-   public String name;
-   public String url;
-   public String version;
-
-   public Extension(String name_, String url_, String version_){
-      name = name_;
-      url = url_;
-      version = version_;
-   }
-}
-
-public class ExtensionManager {
-   protected final static String EXT_LIST_FILE = ".ext-list";
-   protected static ExtensionManager _instance = null;
-   protected File _extListFile;
-   protected ArrayList<Extension> _extensions;
-
-   public static ExtensionManager getInstance(){
-      if(_instance == null)
-         _instance = new ExtensionManager();
-      return _instance;
-   }
-
-   protected void readExtList() {
-      try{
-         FileInputStream fis = new FileInputStream(_extListFile);
-         ObjectInputStream in = new ObjectInputStream(fis);
-         _extensions = (ArrayList<Extension>)in.readObject();
-         in.close();
-      }
-      catch(Exception e){
-         _extensions = new ArrayList<Extension>();
-      }
-   }
-
-   protected void updateExtList() throws IOException, ClassNotFoundException{
-      FileOutputStream fos = new FileOutputStream(_extListFile);
-      ObjectOutputStream out = new ObjectOutputStream(fos);
-      out.writeObject(_extensions);
-      out.close();
-   }
-
-   protected ExtensionManager(){
-      _extListFile = new File(getUserExtPath(),EXT_LIST_FILE);
-      readExtList();
-   }
-   
-   
-   protected Extension find(String name){
-      for(Extension e : _extensions){
-         if(e.name.equals(name))
-            return e;
-      }
-      return null;
-   }
-
-   protected void addExtension(String name, String url, String version){
-      
-      // remove the previously installed extension of the same name
-      Extension old_ext = find(name);
-      if (old_ext != null)
-         _extensions.remove(old_ext);
-      
-      Extension ext = new Extension(name, url, version);
-      _extensions.add(ext);
-
-      try{
-         updateExtList();
-      }
-      catch(Exception e){
-         e.printStackTrace();
-      }
-   }
-   
-   
-   public String getVersion(String name){
-      Extension e = find(name);
-      if (e != null){
-         return e.version;
-      }else{
-         return   null;
-      }
-   }
-   
-   public boolean isOutOfDate(String name, String version){
-      Extension e = find(name);
-      if (e == null){
-         return false;
-      }else{
-         String s1 = normalisedVersion(e.version); // installed version
-         String s2 = normalisedVersion(version);  // version number to check
-         int cmp = s1.compareTo(s2);
-         return cmp < 0;            
-      }
-   }
-
-   public boolean isInstalled(String name){
-      Extension e = find(name);
-      return e != null;
-   }
-
-   private String getExtName(String nameWithVer){
-      int verSep = nameWithVer.lastIndexOf("-");
-      if(verSep>=0){
-         return nameWithVer.substring(0, verSep) + ".jar";
-      }
-      return nameWithVer;
-   }
-
-   /**
-    *  install a Sikuli extension (.JAR)
-    */
-   public boolean install(String name, String url_, String version_){
-      String extPath = getUserExtPath(); 
-      String tmpdir = System.getProperty("java.io.tmpdir");
-      try{
-         URL url = new URL(url_);
-         File localFile = new File(Util.downloadURL(url, tmpdir));
-         String extName = getExtName(localFile.getName());
-         File targetFile = new File(extPath, extName);
-         if(targetFile.exists())
-            targetFile.delete();
-         if( !localFile.renameTo(targetFile) ){
-            Debug.error("Failed to install " + localFile.getName() + " to " + targetFile.getAbsolutePath());
-            return false;
-         }
-         addExtension(name, url_, version_);
-      }
-      catch(IOException e){
-         Debug.error("Failed to download " + url_);
-         e.printStackTrace();
-         return false;
-      }
-      return true;
-   }
-
-   /**
-    *  returns the absolute path to the user's extension path
-    */
-   public String getUserExtPath(){
-      String ret = Env.getSikuliDataPath() + File.separator + "extensions";
-      File f = new File(ret);
-      if(!f.exists())
-        f.mkdirs(); 
-      return ret;
-   }
-   
-   
-  
-  public static String normalisedVersion(String version) {
-      return normalisedVersion(version, ".", 4);
-  }
-
-  public static String normalisedVersion(String version, String sep, int maxWidth) {
-      String[] split = java.util.regex.Pattern.compile(sep, java.util.regex.Pattern.LITERAL).split(version);
-      StringBuilder sb = new StringBuilder();
-      for (String s : split) {
-          sb.append(String.format("%" + maxWidth + 's', s));
-      }
-      return sb.toString();
-  }
-
-}
 
=== removed directory '.pc/jgoodies-1.6-compat.patch'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide'
=== removed file '.pc/jgoodies-1.6-compat.patch/sikuli-ide/CMakeLists.txt'
--- .pc/jgoodies-1.6-compat.patch/sikuli-ide/CMakeLists.txt	2012-12-07 22:13:08 +0000
+++ .pc/jgoodies-1.6-compat.patch/sikuli-ide/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,405 +0,0 @@
-# Copyright 2010-2011, Sikuli.org
-# Released under the MIT License.
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT (sikuli-ide Java)
-
-SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake_modules")
-INCLUDE(${CMAKE_MODULE_PATH}/common.cmake)
-INCLUDE(${CMAKE_MODULE_PATH}/detect_osx_ver.cmake)
-INCLUDE(${CMAKE_MODULE_PATH}/find_dep_libs.cmake)
-
-
-ENABLE_TESTING()
-
-SET(CMAKE_VERBOSE_MAKEFILE 0)
-
-FIND_PACKAGE(Java 1.6 REQUIRED)
-SET( NON_NATIVE_TARGET TRUE)
-
-IF(UNIX)
-   SET(SEP ":")
-ELSE()
-   SET(SEP ";")
-ENDIF()
-
-
-SET(BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-SET(JAVA_SRC_DIR "${BASE_DIR}/src/main/java")
-SET(NATIVE_SRC_DIR "${BASE_DIR}/src/main/native")
-SET(COMMON_LIB_DIR "${BASE_DIR}/../lib")
-SET(INCLUDE_LIB_DIR "${BASE_DIR}/lib")
-SET(BINARY_DIR "${BASE_DIR}/target")
-SET(BINARY_CLASS_DIR "${BINARY_DIR}/classes")
-SET(BINARY_LIB_DIR "${BINARY_DIR}/lib")
-SET(JAR_DIR "${BINARY_DIR}/jar")
-SET(RESOURCE_DIR "${BASE_DIR}/resources")
-SET(RELEASE_DIR "${BASE_DIR}/../release")
-
-SET(JAVA_TEST_DIR "${BASE_DIR}/src/test/java")
-SET(TEST_RESOURCE_DIR "test-res")
-SET(JAVA_TEST_FOR_HUDSON_XML "../hudson-test.xml")
-SET(TEST_CLASS_DIR "${CMAKE_BINARY_DIR}/test") 
-
-SET(SIKULI_SCRIPT_JAR "${COMMON_LIB_DIR}/sikuli-script.jar")
-SET(JUNIT_JAR "/usr/share/java/junit.jar")
-SET(SWING_LAYOUT_JAR "/usr/share/java/swing-layout.jar")
-SET(COMMONS_CLI_JAR "/usr/share/java/commons-cli.jar")
-SET(JSON_SIMPLE_JAR "/usr/share/java/json_simple.jar")
-SET(SWINGX_JAR "/usr/share/java/swingx-core.jar")
-SET(MAC_WIDGETS_JAR "/usr/share/java/mac_widgets.jar")
-SET(FORMS_JAR "/usr/share/java/forms.jar")
-
-
-FILE(MAKE_DIRECTORY ${BINARY_DIR})
-FILE(MAKE_DIRECTORY ${BINARY_CLASS_DIR})
-FILE(MAKE_DIRECTORY ${JAR_DIR})
-FILE(MAKE_DIRECTORY ${TEST_CLASS_DIR})
-
-## Sikuli IDE
-
-SET(MAIN_CLASS org.sikuli.ide.SikuliIDE)
-SET(RUN_USER_ARGS -Dsikuli.console=true -Dfile.encoding=UTF-8 
-             -Dsikuli.testing=yes
-             -Xms64m -Xmx512m 
-   CACHE STRING 
-   "The arguments for running Sikuli IDE with 'make run-user'"
-)
-SET(RUN_ARGS -Dsikuli.console=false -Dsikuli.Debug=3 -Dfile.encoding=UTF-8 
-             -Dsikuli.testing=yes
-             -Xms64m -Xmx512m 
-             #-Duser.language=zh -Duser.region=TW 
-   CACHE STRING 
-   "The arguments for running Sikuli IDE with 'make run'"
-)
-IF(APPLE)
-   LIST(APPEND RUN_ARGS -Xdock:name='Sikuli IDE') 
-ENDIF()
-
-#SET(ARGS -s -r ../sample-scripts/mod1.sikuli --args a1 a2) # example args
-SET(ARGS "")
-
-SET(CLASSPATH 
-   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}/usr/share/java/jython.jar
-)
-
-SET(JAR_FILE sikuli-ide.jar)
-SET(RESOURCES icons META-INF scripts i18n)
-
-IF(LINUX)
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-linux.MF)
-   #SET(CLASSPATH ${CLASSPATH}${SEP}${JXGRABKEY_JAR})
-ELSEIF(WIN32)
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-win32.MF)
-   #SET(CLASSPATH ${CLASSPATH}${SEP}${JINTELLITYPE_JAR})
-ELSE()
-   SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST.MF)
-ENDIF()
-
-
-add_custom_target( ${JAR_FILE} 
-   COMMAND ${JAVA_ARCHIVE} cfm ${BINARY_DIR}/${JAR_FILE}
-           ${MANIFEST} -C ${JAR_DIR} *
-   COMMAND ${CMAKE_COMMAND} -E copy ${BINARY_DIR}/${JAR_FILE} ${COMMON_LIB_DIR}/${JAR_FILE}
-   COMMENT "Packaging ${JAR_FILE}"
-   WORKING_DIRECTORY ${JAR_DIR}
-)
-
-add_custom_target( ${JAR_FILE}.resources
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${RESOURCE_DIR} ${JAR_DIR}
-   COMMENT "Copying IDE resources"
-)
-
-add_custom_target( ${JAR_FILE}.prepare
-   COMMENT "Preparing ${JAR_FILE}"
-)
-
-add_custom_target( run-user
-   COMMAND ${JAVA_RUNTIME} ${RUN_USER_ARGS} 
-                        -classpath "${CLASSPATH}${SEP}${JAR_DIR}"
-                        ${MAIN_CLASS} ${ARGS}
-)
-
-add_custom_target( run
-   COMMAND ${JAVA_RUNTIME} ${RUN_ARGS} 
-                        -classpath "${CLASSPATH}${SEP}${JAR_DIR}"
-                        ${MAIN_CLASS} ${ARGS}
-)
-
-if(NOT DEFINED SIKULI_VERSION OR SIKULI_VERSION STREQUAL "")
-   file(READ ${BASE_DIR}/latest-ver SIKULI_VERSION)
-   STRING(STRIP ${SIKULI_VERSION} SIKULI_VERSION)
-ENDIF()
-message("Sikuli Version ${SIKULI_VERSION}")
-
-SET(JYTHON_CLASS org.python.util.jython)
-add_custom_target( update-version
-      COMMAND ${JAVA_RUNTIME} -cp "${CLASSPATH}" ${JYTHON_CLASS} ${BASE_DIR}/../utils/update-version.py  ${JAVA_SRC_DIR}/org/sikuli/ide/IDESettings.java "${SIKULI_VERSION}"
-   COMMENT "Update version number in Sikuli-IDE"
-)
-
-SET(INCLUDE_JARS ${SIKULI_SCRIPT_JAR} ${JUNIT_JAR} 
-                 ${SWING_LAYOUT_JAR} ${COMMONS_CLI_JAR}
-                 ${BINARY_DIR}/${JAR_FILE} ${JSON_SIMPLE_JAR}
-                 ${SWINGX_JAR} ${MAC_WIDGETS_JAR} ${FORMS_JAR}
-)
-
-## Windows Package
-
-IF(WIN32)
-   SET(OS "win32")
-   SET(APP_FILE "Sikuli-IDE")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE})
-   SET(FRAMEWORKS_IN_APP_DIR  ${JAR_IN_APP_DIR}/libs)
-   SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
-
-   #LIST(APPEND INCLUDE_JARS ${JINTELLITYPE_JAR})
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.dll")
-   SET(jnilibs ${sikuli_script_jnilibs})
-ENDIF()
-
-## Linux Package
-
-IF(LINUX)
-   SET(OS "linux")
-   SET(APP_FILE "Sikuli-IDE")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE})
-   SET(FRAMEWORKS_IN_APP_DIR  ${JAR_IN_APP_DIR}/libs)
-   SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
-
-   #LIST(APPEND INCLUDE_JARS ${JXGRABKEY_JAR})
-   SET(jnilibs "")
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.so")
-   LIST(APPEND jnilibs ${sikuli_script_jnilibs})
-ENDIF(LINUX)
-
-## Sikuli-IDE.App for Mac OS X
-
-IF(APPLE)
-   IF(APPLE_SNOW_LEOPARD)
-      SET(OSX_VER "osx-10.6")
-   ELSEIF(APPLE_LEOPARD)
-      SET(OSX_VER "osx-10.5")
-   ENDIF()
-   SET(OS ${OSX_VER})
-
-   SET(APP_FILE  "Sikuli-IDE.app")
-   SET(BINARY_APP_DIR  "${BINARY_DIR}/${OS}")
-   SET(JAR_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE}/Contents/Resources/Java)
-   SET(FRAMEWORKS_IN_APP_DIR  ${BINARY_APP_DIR}/${APP_FILE}/Contents/Frameworks)
-
-   FIND_PACKAGE(OpenCV REQUIRED)
-   #message("opencv lib: ${OpenCV_LIB_DIR}")
-   LIST(APPEND CMAKE_LIBRARY_PATH ${OpenCV_LIB_DIR})
-
-   FILE(GLOB jnilibs "${BINARY_LIB_DIR}/*.jnilib")
-   FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.jnilib")
-   LIST(APPEND jnilibs ${sikuli_script_jnilibs})
-
-   find_dep_libs("${jnilibs}" deplibs)
-   find_dep_libs("${deplibs}" deplibs)
-   #MESSAGE("Dep: ${deplibs}")
-
-ENDIF(APPLE)
-
-SET(RELEASE_FILE "Sikuli-${SIKULI_VERSION}-${OS}")
-
-## Packaging App
-add_custom_target( ${APP_FILE}
-   COMMENT "Generate ${BINARY_DIR}/${APP_FILE}"
-)
-
-add_dependencies( ${APP_FILE} ${JAR_FILE} )
-
-IF(LINUX)
-   EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE SYSTEM_ARCH)
-   SET(RELEASE_FILE "${RELEASE_FILE}-${SYSTEM_ARCH}")
-   if(SYSTEM_ARCH MATCHES "x86_64")
-      SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jxgrabkey/lib/libJXGrabKey-64.so")
-   else()
-      SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jxgrabkey/lib/libJXGrabKey-32.so")
-   endif()
-
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp ${jnilibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMENT "Packaging Frameworks in App"
-   )
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) 
-
-ENDIF(LINUX)
-
-IF(WIN32)
-   SET(APP_FILES Sikuli-IDE-w.bat Sikuli-IDE.bat Sikuli-IDE.exe ide-icon.ico)
-   SET(WIN32_LIBS ${COMMON_LIB_DIR}/win32)
-   SET(OPENCV_LIBS cv210 cvaux210 cxcore210 highgui210 ml210)
-
-   SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jintellitype-1.3.6/JIntellitype.dll")
-   add_custom_target( ${JAR_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${JAR_LIB_DIR}
-      #COMMAND ${CMAKE_COMMAND} -E copy ${LIB_GRABKEY} ${JAR_LIB_DIR}/
-      COMMENT "Packaging Frameworks in Jar"
-   )
-   add_dependencies( ${JAR_FILE} ${JAR_FILE}.framework ) 
-
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${WIN32_LIBS} ${FRAMEWORKS_IN_APP_DIR}
-      COMMENT "Packaging Frameworks in App"
-   )
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) 
-
-   #libs
-
-   install(FILES ${jnilibs}
-           DESTINATION ${FRAMEWORKS_IN_APP_DIR})
-   FOREACH(F ${OPENCV_LIBS})
-      install(FILES ${OpenCV_DIR}/bin/${F}.dll
-              DESTINATION ${FRAMEWORKS_IN_APP_DIR})
-   ENDFOREACH()
-
-   FOREACH(F ${APP_FILES})
-      install(FILES ${BINARY_APP_DIR}/${F}
-              DESTINATION ${JAR_IN_APP_DIR})
-
-   ENDFOREACH()
-ENDIF(WIN32)
-
-IF(APPLE)
-   add_custom_target( ${APP_FILE}.framework 
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp -f ${jnilibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND cp -f ${deplibs} ${FRAMEWORKS_IN_APP_DIR}
-      COMMAND ${CMAKE_COMMAND} -E chdir ${FRAMEWORKS_IN_APP_DIR} ./change-lib-path.sh
-      COMMENT "Packaging Frameworks"
-   )
-
-   add_custom_target( ${APP_FILE}.update_ver
-	COMMAND defaults write ${BINARY_APP_DIR}/${APP_FILE}/Contents/Info CFBundleVersion `echo ${SIKULI_VERSION} | awk '{print $$1}'`
-	COMMAND plutil -convert xml1 ${BINARY_APP_DIR}/${APP_FILE}/Contents/Info.plist
-   )
-
-   add_dependencies( ${APP_FILE} ${APP_FILE}.framework ${APP_FILE}.update_ver)
-
-ENDIF(APPLE)
-
-install(DIRECTORY ${BINARY_APP_DIR}/${APP_FILE}
-   USE_SOURCE_PERMISSIONS
-   DESTINATION .
-)
-
-
-add_custom_target( app ALL
-)
-
-
-FOREACH(JAR ${INCLUDE_JARS})
-   get_filename_component(JAR_FILENAME ${JAR} NAME)
-   get_filename_component(target ${JAR} NAME_WE)
-   set(target "include_${target}")
-   add_custom_target( ${target}
-      COMMAND ${CMAKE_COMMAND} -E copy ${JAR} ${JAR_IN_APP_DIR}/${JAR_FILENAME}
-                  
-      COMMENT "Copying ${JAR_FILENAME}"
-   )
-   add_dependencies( ${APP_FILE} ${target} )
-ENDFOREACH(JAR ${INCLUDE_JARS})
-
-
-get_filename_component(target ${JAR_FILE} NAME_WE)
-add_dependencies( include_${target} ${JAR_FILE})
-add_dependencies( app ${APP_FILE})
-
-## Language files
-
-add_custom_target( update-po
-   COMMAND prop2po ${RESOURCE_DIR}/i18n/IDE_en_US.properties > ${RESOURCE_DIR}/i18n/IDE/IDE.pot
-               
-   COMMENT "Update the IDE.pot file"
-)
-
-add_custom_target( update-prop
-   COMMAND ${BASE_DIR}/../utils/update-prop.sh ${RESOURCE_DIR}
-   COMMENT "Update the IDE language properties."
-)
-
-
-## Packaging
-
-if(APPLE)
-      SET(CPACK_GENERATOR DragNDrop )
-      #   SET(CPACK_GENERATOR ZIP )
-else(APPLE)
-   SET(CPACK_GENERATOR 
-      ZIP
-   )
-endif(APPLE)
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sikuli ${SIKULI_VERSION}")
-SET(CPACK_PACKAGE_VENDOR "Sikuli Development Team")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${BASE_DIR}/../readme.txt")
-SET(CPACK_RESOURCE_FILE_LICENSE "${BASE_DIR}/../copyright.txt")
-SET(CPACK_PACKAGE_FILE_NAME ${RELEASE_FILE})
-
-INCLUDE(CPack)
-
-install(FILES 
-   ${CPACK_PACKAGE_DESCRIPTION_FILE}
-   ${CPACK_RESOURCE_FILE_LICENSE}
-   DESTINATION .
-)
-
-# type "make package" to generate release packages
-
-
-## tests
-
-SET(MAIN_TEST_SUITE ${PACKAGE}.SikuliIDETestSuite)
-
-add_custom_target( java-test.test-res
-   COMMAND ${CMAKE_COMMAND} -E copy_directory ${BASE_DIR}/${TEST_RESOURCE_DIR} ${CMAKE_BINARY_DIR}/${TEST_RESOURCE_DIR}
-   COMMENT "Copy test resource"
-)
-
-add_custom_target( java-test
-   #   COMMAND ${JAVA_RUNTIME} -cp ${TEST_CLASS_DIR}${SEP}${BINARY_DIR}/${JAR_FILE}${SEP}${JUNIT_JAR} junit.textui.TestRunner ${MAIN_TEST_SUITE}
-   COMMAND ant -f ${JAVA_TEST_FOR_HUDSON_XML}
-   COMMENT "Run Java unit tests"
-)
-
-add_dependencies( java-test
-        ${JAR_FILE}
-        ${PROJECT_NAME}.test.classes
-        java-test.test-res
-)
-
-add_custom_target( all-test
-)
-
-add_dependencies( all-test
-   java-test   
-)
-
-## Dependencies
-
-add_dependencies( ${JAR_FILE}.prepare
-        ${JAR_FILE}.resources
-        ${JAR_FILE}.classes-in-jar 
-        #        ${JAR_FILE}.libs-in-jar
-)
-
-add_dependencies( ${JAR_FILE} ${JAR_FILE}.prepare )
-add_dependencies( run-user ${JAR_FILE})
-add_dependencies( run ${JAR_FILE})
-add_dependencies( app ${APP_FILE}) 
-
-
-ADD_SUBDIRECTORY( ${JAVA_SRC_DIR} )
-#ADD_SUBDIRECTORY( ${NATIVE_SRC_DIR} )
-ADD_SUBDIRECTORY( ${JAVA_TEST_DIR} )
-
-
-
-SET(SIKULI_VERSION  CACHE INTERNAL "" FORCE)
-
 
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli'
=== removed directory '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli/ide'
=== removed file '.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java'
--- .pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java	2012-12-07 22:13:08 +0000
+++ .pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java	1970-01-01 00:00:00 +0000
@@ -1,561 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.ide;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.util.prefs.*;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JList;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSpinner;
-import javax.swing.JTabbedPane;
-import javax.swing.JTextField;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.SwingConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import com.jgoodies.forms.factories.DefaultComponentFactory;
-import org.jdesktop.layout.*;
-
-import org.sikuli.script.Debug;
-
-/*
- * Created by JFormDesigner on Mon Nov 16 10:13:52 EST 2009
- */
-
-
-public class PreferencesWin extends JFrame {
-   UserPreferences pref = UserPreferences.getInstance();
-   int _cap_hkey, _cap_mod;
-   int _old_cap_hkey, _old_cap_mod;
-
-   public PreferencesWin() {
-      super( SikuliIDE._I("winPreferences") );
-      initComponents();
-      loadPrefs();
-   }
-
-   private void loadPrefs(){
-      SikuliIDE ide = SikuliIDE.getInstance();
-      double delay = pref.getCaptureDelay();
-      _spnDelay.setValue(delay);
-      _old_cap_hkey = _cap_hkey = pref.getCaptureHotkey();
-      _old_cap_mod = _cap_mod = pref.getCaptureHotkeyModifiers();
-      setTxtHotkey(_cap_hkey, _cap_mod);
-      switch(pref.getAutoNamingMethod()){
-         case UserPreferences.AUTO_NAMING_TIMESTAMP:
-            _radTimestamp.setSelected(true);
-            break;
-         case UserPreferences.AUTO_NAMING_OCR:
-            _radOCR.setSelected(true);
-            break;
-         case UserPreferences.AUTO_NAMING_OFF:
-            _radOff.setSelected(true);
-            break;
-         default:
-            Debug.error("Error in reading auto naming method preferences");
-      }
-      _chkAutoUpdate.setSelected(pref.getCheckUpdate());
-
-      _chkExpandTab.setSelected(pref.getExpandTab());
-      _spnTabWidth.setValue(pref.getTabWidth());
-      initFontPrefs();
-      initLangPrefs();
-   }
-
-   private void initLangPrefs(){
-      String[] SUPPORT_LOCALES = {
-         "es", "pt_BR", "ar", "fr", "ru", "bg", "he", "sv", "ca", "ja", "tr", 
-         "da", "ko", "uk", "de", "nl", "zh_CN", "en_US", "pl", "zh_TW"
-      };
-      Locale[] sortedLocales = new Locale[SUPPORT_LOCALES.length];
-      UserPreferences pref = UserPreferences.getInstance();
-      int count = 0;
-      for (String locale_code: SUPPORT_LOCALES){
-         Locale l;
-         if( locale_code.indexOf("_")>=0 ){
-            String[] lang_country = locale_code.split("_");
-            l = new Locale(lang_country[0], lang_country[1]);
-         }
-         else
-            l = new Locale(locale_code);
-         sortedLocales[count++] = l;
-      }
-      Arrays.sort(sortedLocales, new Comparator<Locale>(){
-         public int compare(Locale l1, Locale l2) {
-            return l1.getDisplayLanguage().compareTo(l2.getDisplayLanguage());
-         }
-      });
-
-      for(Locale l : sortedLocales){
-         _cmbLang.addItem(l);
-      }
-      _cmbLang.setRenderer(new LocaleListCellRenderer());
-      Locale curLocale = pref.getLocale();
-      _cmbLang.setSelectedItem(curLocale);
-      if(!_cmbLang.getSelectedItem().equals(curLocale)){
-         if(curLocale.getVariant().length() > 0){
-            curLocale = new Locale(curLocale.getLanguage(), curLocale.getCountry());
-            _cmbLang.setSelectedItem(curLocale);
-         }
-         if(!_cmbLang.getSelectedItem().equals(curLocale))
-            _cmbLang.setSelectedItem(new Locale(curLocale.getLanguage()));
-      }
-   }
-
-   
-   private void initFontPrefs(){
-      UserPreferences pref = UserPreferences.getInstance();
-      String[] fontList = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                              .getAvailableFontFamilyNames();
-      for (String font: fontList)
-         _cmbFontName.addItem(font);
-      _cmbFontName.setSelectedItem(pref.getFontName());
-      _spnFontSize.setValue(pref.getFontSize());
-   }
-
-   private void savePrefs(){
-      SikuliIDE ide = SikuliIDE.getInstance();
-      pref.setCaptureDelay((Double)_spnDelay.getValue());
-      pref.setCaptureHotkey(_cap_hkey);
-      pref.setCaptureHotkeyModifiers(_cap_mod);
-      pref.setAutoNamingMethod(
-            _radTimestamp.isSelected()?UserPreferences.AUTO_NAMING_TIMESTAMP:
-            _radOCR.isSelected()?UserPreferences.AUTO_NAMING_OCR:
-            UserPreferences.AUTO_NAMING_OFF);
-      if(_old_cap_hkey != _cap_hkey || _old_cap_mod != _cap_mod){
-         ide.removeCaptureHotkey(_old_cap_hkey, _old_cap_mod);
-         ide.installCaptureHotkey(_cap_hkey, _cap_mod);
-      }
-      pref.setCheckUpdate(_chkAutoUpdate.isSelected());
-
-      pref.setExpandTab(_chkExpandTab.isSelected());
-      pref.setTabWidth((Integer)_spnTabWidth.getValue());
-
-      pref.setFontName( (String)_cmbFontName.getSelectedItem() );
-      pref.setFontSize( (Integer)_spnFontSize.getValue() );
-
-      Locale locale = (Locale)_cmbLang.getSelectedItem();
-      pref.setLocale(locale);
-      I18N.setLocale(locale);
-   }
-
-   private void setTxtHotkey(int code, int mod){
-      _cap_hkey = code;
-      _cap_mod = mod;
-      _txtHotkey.setText( Utils.convertKeyToText(code, mod) );
-   }
-
-   private void btnOkActionPerformed(ActionEvent e) {
-      savePrefs();
-      this.dispose();
-   }
-
-   private void btnCancelActionPerformed(ActionEvent e) {
-      this.dispose();
-   }
-
-   private void txtHotkeyFocusGained(FocusEvent e) {
-      _txtHotkey.setEditable(true);
-   }
-
-   private void txtHotkeyKeyPressed(KeyEvent e) {
-      int code = e.getKeyCode();
-      int mod = e.getModifiers();
-      Debug.log(7, "" + code + " " + mod);
-      setTxtHotkey(code, mod);
-      _txtHotkey.setEditable(false);
-   }
-
-   private void updateFontPreview(){
-      SikuliIDE ide = SikuliIDE.getInstance();
-      Font font = new Font((String)_cmbFontName.getSelectedItem(), Font.PLAIN, 
-                           (Integer)_spnFontSize.getValue());
-      ide.getCurrentCodePane().setFont(font);
-   }
-
-   private void fontNameItemStateChanged(ItemEvent e) {
-      updateFontPreview();
-   }
-
-   private void fontSizeStateChanged(ChangeEvent e) {
-      updateFontPreview();
-   }
-
-	private void initComponents() {
-		// JFormDesigner - Component initialization - DO NOT MODIFY  //GEN-BEGIN:initComponents
-      DefaultComponentFactory compFactory = DefaultComponentFactory.getInstance();
-      _tabPane = new JTabbedPane();
-      JPanel paneCapture = new JPanel();
-      _txtHotkey = new JTextField();
-      _lblHotkey = new JLabel();
-      _lblDelay = new JLabel();
-      _spnDelay = new JSpinner();
-      _lblDelaySecs = new JLabel();
-      _lblNaming = new JLabel();
-      _radTimestamp = new JRadioButton();
-      _radOCR = new JRadioButton();
-      _radOff = new JRadioButton();
-      _paneTextEditing = new JPanel();
-      _chkExpandTab = new JCheckBox();
-      _lblTabWidth = new JLabel();
-      _cmbFontName = new JComboBox();
-      _lblFont = new JLabel();
-      _titleAppearance = compFactory.createTitle("");
-      _titleIndentation = compFactory.createTitle("");
-      _spnTabWidth = new JSpinner();
-      _lblFontSize = new JLabel();
-      _spnFontSize = new JSpinner();
-      JPanel paneGeneral = new JPanel();
-      _chkAutoUpdate = new JCheckBox();
-      _cmbLang = new JComboBox();
-      _lblUpdates = new JLabel();
-      _lblLanguage = new JLabel();
-      JPanel paneOkCancel = new JPanel();
-      JPanel hSpacer1 = new JPanel(null);
-      _btnOk = new JButton();
-      _btnCancel = new JButton();
-
-      //======== this ========
-      Container contentPane = getContentPane();
-      contentPane.setLayout(new BorderLayout());
-
-      //======== _tabPane ========
-      {
-         _tabPane.setBorder(new EmptyBorder(10, 10, 0, 10));
-
-         //======== paneCapture ========
-         {
-
-            //---- _txtHotkey ----
-            _txtHotkey.setHorizontalAlignment(SwingConstants.RIGHT);
-            _txtHotkey.addFocusListener(new FocusAdapter() {
-               @Override
-               public void focusGained(FocusEvent e) {
-                  txtHotkeyFocusGained(e);
-               }
-            });
-            _txtHotkey.addKeyListener(new KeyAdapter() {
-               @Override
-               public void keyPressed(KeyEvent e) {
-                  txtHotkeyKeyPressed(e);
-               }
-            });
-
-            //---- _lblHotkey ----
-            _lblHotkey.setLabelFor(_txtHotkey);
-
-            //---- _lblDelay ----
-            _lblDelay.setLabelFor(_spnDelay);
-
-            //---- _spnDelay ----
-            _spnDelay.setModel(new SpinnerNumberModel(1.0, 0.0, null, 0.1));
-
-            //---- _radTimestamp ----
-            _radTimestamp.setSelected(true);
-
-            GroupLayout paneCaptureLayout = new GroupLayout(paneCapture);
-            paneCapture.setLayout(paneCaptureLayout);
-            paneCaptureLayout.setHorizontalGroup(
-               paneCaptureLayout.createParallelGroup()
-                  .add(paneCaptureLayout.createSequentialGroup()
-                     .add(26, 26, 26)
-                     .add(paneCaptureLayout.createParallelGroup()
-                        .add(GroupLayout.TRAILING, _lblDelay)
-                        .add(GroupLayout.TRAILING, _lblHotkey)
-                        .add(GroupLayout.TRAILING, _lblNaming))
-                     .addPreferredGap(LayoutStyle.RELATED)
-                     .add(paneCaptureLayout.createParallelGroup()
-                        .add(_radTimestamp)
-                        .add(_radOCR)
-                        .add(_radOff)
-                        .add(paneCaptureLayout.createSequentialGroup()
-                           .add(_spnDelay, GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE)
-                           .addPreferredGap(LayoutStyle.RELATED)
-                           .add(_lblDelaySecs, GroupLayout.DEFAULT_SIZE, 161, Short.MAX_VALUE))
-                        .add(_txtHotkey, GroupLayout.DEFAULT_SIZE, 315, Short.MAX_VALUE))
-                     .add(69, 69, 69))
-            );
-            paneCaptureLayout.setVerticalGroup(
-               paneCaptureLayout.createParallelGroup()
-                  .add(paneCaptureLayout.createSequentialGroup()
-                     .add(34, 34, 34)
-                     .add(paneCaptureLayout.createParallelGroup(GroupLayout.BASELINE)
-                        .add(_lblHotkey, GroupLayout.PREFERRED_SIZE, 22, GroupLayout.PREFERRED_SIZE)
-                        .add(_txtHotkey, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                     .addPreferredGap(LayoutStyle.RELATED)
-                     .add(paneCaptureLayout.createParallelGroup()
-                        .add(_lblDelay, GroupLayout.PREFERRED_SIZE, 28, GroupLayout.PREFERRED_SIZE)
-                        .add(_spnDelay, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                        .add(_lblDelaySecs, GroupLayout.PREFERRED_SIZE, 28, GroupLayout.PREFERRED_SIZE))
-                     .addPreferredGap(LayoutStyle.RELATED)
-                     .add(paneCaptureLayout.createParallelGroup(GroupLayout.LEADING, false)
-                        .add(paneCaptureLayout.createSequentialGroup()
-                           .add(paneCaptureLayout.createParallelGroup(GroupLayout.BASELINE)
-                              .add(_lblNaming, GroupLayout.PREFERRED_SIZE, 22, GroupLayout.PREFERRED_SIZE)
-                              .add(_radTimestamp))
-                           .add(18, 18, 18)
-                           .add(_radOff)
-                           .addPreferredGap(LayoutStyle.RELATED))
-                        .add(GroupLayout.TRAILING, paneCaptureLayout.createSequentialGroup()
-                           .add(_radOCR)
-                           .add(21, 21, 21)))
-                     .add(80, 80, 80))
-            );
-         }
-         _tabPane.addTab(I18N._I("prefTabScreenCapturing"), paneCapture);
-
-
-         //======== _paneTextEditing ========
-         {
-
-            //---- _lblTabWidth ----
-            _lblTabWidth.setLabelFor(_spnTabWidth);
-
-            //---- _cmbFontName ----
-            _cmbFontName.addItemListener(new ItemListener() {
-               public void itemStateChanged(ItemEvent e) {
-                  fontNameItemStateChanged(e);
-               }
-            });
-
-            //---- _lblFont ----
-            _lblFont.setLabelFor(_cmbFontName);
-
-            //---- _lblFontSize ----
-            _lblFontSize.setLabelFor(_cmbFontName);
-
-            //---- _spnFontSize ----
-            _spnFontSize.addChangeListener(new ChangeListener() {
-               public void stateChanged(ChangeEvent e) {
-                  fontSizeStateChanged(e);
-               }
-            });
-
-            GroupLayout _paneTextEditingLayout = new GroupLayout(_paneTextEditing);
-            _paneTextEditing.setLayout(_paneTextEditingLayout);
-            _paneTextEditingLayout.setHorizontalGroup(
-               _paneTextEditingLayout.createParallelGroup()
-                  .add(GroupLayout.TRAILING, _paneTextEditingLayout.createSequentialGroup()
-                     .add(95, 95, 95)
-                     .add(_paneTextEditingLayout.createParallelGroup()
-                        .add(_titleIndentation, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                        .add(_paneTextEditingLayout.createSequentialGroup()
-                           .add(_titleAppearance, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                           .addPreferredGap(LayoutStyle.RELATED)
-                           .add(_paneTextEditingLayout.createParallelGroup()
-                              .add(_paneTextEditingLayout.createSequentialGroup()
-                                 .add(29, 29, 29)
-                                 .add(_paneTextEditingLayout.createParallelGroup()
-                                    .add(GroupLayout.TRAILING, _lblTabWidth)
-                                    .add(GroupLayout.TRAILING, _lblFont)
-                                    .add(GroupLayout.TRAILING, _lblFontSize))
-                                 .addPreferredGap(LayoutStyle.RELATED)
-                                 .add(_paneTextEditingLayout.createParallelGroup()
-                                    .add(_cmbFontName, 0, 218, Short.MAX_VALUE)
-                                    .add(_spnFontSize, GroupLayout.PREFERRED_SIZE, 67, GroupLayout.PREFERRED_SIZE)
-                                    .add(_spnTabWidth, GroupLayout.PREFERRED_SIZE, 52, GroupLayout.PREFERRED_SIZE))
-                                 .addPreferredGap(LayoutStyle.RELATED, 97, Short.MAX_VALUE))
-                              .add(_chkExpandTab, GroupLayout.DEFAULT_SIZE, 420, Short.MAX_VALUE))))
-                     .addContainerGap())
-            );
-            _paneTextEditingLayout.setVerticalGroup(
-               _paneTextEditingLayout.createParallelGroup()
-                  .add(_paneTextEditingLayout.createSequentialGroup()
-                     .add(21, 21, 21)
-                     .add(_titleIndentation, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                     .add(_paneTextEditingLayout.createParallelGroup()
-                        .add(_paneTextEditingLayout.createSequentialGroup()
-                           .add(81, 81, 81)
-                           .add(_titleAppearance, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                        .add(_paneTextEditingLayout.createSequentialGroup()
-                           .addPreferredGap(LayoutStyle.RELATED)
-                           .add(_chkExpandTab)
-                           .addPreferredGap(LayoutStyle.RELATED)
-                           .add(_paneTextEditingLayout.createParallelGroup()
-                              .add(_lblTabWidth, GroupLayout.PREFERRED_SIZE, 16, GroupLayout.PREFERRED_SIZE)
-                              .add(_spnTabWidth, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                           .add(40, 40, 40)
-                           .add(_paneTextEditingLayout.createParallelGroup(GroupLayout.BASELINE)
-                              .add(_lblFont)
-                              .add(_cmbFontName, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-                           .addPreferredGap(LayoutStyle.RELATED)
-                           .add(_paneTextEditingLayout.createParallelGroup(GroupLayout.TRAILING)
-                              .add(_lblFontSize, GroupLayout.PREFERRED_SIZE, 27, GroupLayout.PREFERRED_SIZE)
-                              .add(_spnFontSize, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))))
-                     .addContainerGap(154, Short.MAX_VALUE))
-            );
-            _paneTextEditingLayout.linkSize(new Component[] {_lblTabWidth, _spnTabWidth}, GroupLayout.VERTICAL);
-            _paneTextEditingLayout.linkSize(new Component[] {_cmbFontName, _lblFont}, GroupLayout.VERTICAL);
-         }
-         _tabPane.addTab(I18N._I("PreferencesWin.paneTextEditing.tab.title"), _paneTextEditing);
-
-
-         //======== paneGeneral ========
-         {
-
-            //---- _lblUpdates ----
-            _lblUpdates.setFont(_lblUpdates.getFont().deriveFont(_lblUpdates.getFont().getStyle() | Font.BOLD));
-
-            //---- _lblLanguage ----
-            _lblLanguage.setFont(_lblLanguage.getFont().deriveFont(_lblLanguage.getFont().getStyle() | Font.BOLD));
-
-            GroupLayout paneGeneralLayout = new GroupLayout(paneGeneral);
-            paneGeneral.setLayout(paneGeneralLayout);
-            paneGeneralLayout.setHorizontalGroup(
-               paneGeneralLayout.createParallelGroup()
-                  .add(paneGeneralLayout.createSequentialGroup()
-                     .add(137, 137, 137)
-                     .add(paneGeneralLayout.createParallelGroup()
-                        .add(paneGeneralLayout.createSequentialGroup()
-                           .add(_lblLanguage)
-                           .add(185, 185, 185))
-                        .add(paneGeneralLayout.createSequentialGroup()
-                           .add(38, 38, 38)
-                           .add(_cmbLang, GroupLayout.PREFERRED_SIZE, 215, GroupLayout.PREFERRED_SIZE))
-                        .add(paneGeneralLayout.createSequentialGroup()
-                           .add(_lblUpdates)
-                           .add(318, 318, 318))
-                        .add(GroupLayout.TRAILING, paneGeneralLayout.createSequentialGroup()
-                           .add(38, 38, 38)
-                           .add(_chkAutoUpdate, GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)))
-                     .addContainerGap())
-            );
-            paneGeneralLayout.setVerticalGroup(
-               paneGeneralLayout.createParallelGroup()
-                  .add(paneGeneralLayout.createSequentialGroup()
-                     .add(26, 26, 26)
-                     .add(_lblUpdates)
-                     .addPreferredGap(LayoutStyle.RELATED)
-                     .add(_chkAutoUpdate)
-                     .add(40, 40, 40)
-                     .add(_lblLanguage)
-                     .addPreferredGap(LayoutStyle.RELATED)
-                     .add(_cmbLang, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
-                     .addContainerGap(196, Short.MAX_VALUE))
-            );
-         }
-         _tabPane.addTab(I18N._I("prefTabGeneralSettings"), paneGeneral);
-
-      }
-      contentPane.add(_tabPane, BorderLayout.CENTER);
-
-      //======== paneOkCancel ========
-      {
-         paneOkCancel.setBorder(new EmptyBorder(5, 5, 5, 5));
-         paneOkCancel.setLayout(new BoxLayout(paneOkCancel, BoxLayout.X_AXIS));
-         paneOkCancel.add(hSpacer1);
-
-         //---- _btnOk ----
-         _btnOk.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-               btnOkActionPerformed(e);
-            }
-         });
-         paneOkCancel.add(_btnOk);
-
-         //---- _btnCancel ----
-         _btnCancel.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-               btnCancelActionPerformed(e);
-            }
-         });
-         paneOkCancel.add(_btnCancel);
-      }
-      contentPane.add(paneOkCancel, BorderLayout.SOUTH);
-      setSize(600, 475);
-      setLocationRelativeTo(getOwner());
-
-      //---- btngrpNaming ----
-      ButtonGroup btngrpNaming = new ButtonGroup();
-      btngrpNaming.add(_radTimestamp);
-      btngrpNaming.add(_radOCR);
-      btngrpNaming.add(_radOff);
-
-      initComponentsI18n();
-		// JFormDesigner - End of component initialization  //GEN-END:initComponents
-	}
-
-   private void initComponentsI18n() {
-      // JFormDesigner - Component i18n initialization - DO NOT MODIFY  //GEN-BEGIN:initI18n
-      DefaultComponentFactory.setTextAndMnemonic(_titleAppearance, I18N._I("PreferencesWin.titleAppearance.textWithMnemonic"));
-      DefaultComponentFactory.setTextAndMnemonic(_titleIndentation, I18N._I("PreferencesWin.titleIndentation.textWithMnemonic"));
-      _lblHotkey.setText(I18N._I("prefCaptureHotkey"));
-      _lblDelay.setText(I18N._I("prefCaptureDelay"));
-      _lblDelaySecs.setText(I18N._I("prefSeconds"));
-      _lblNaming.setText(I18N._I("prefAutoNaming"));
-      _radTimestamp.setText(I18N._I("prefTimestamp"));
-      _radOCR.setText(I18N._I("prefRecognizedText"));
-      _radOff.setText(I18N._I("prefManualInput"));
-      _tabPane.setTitleAt(0, I18N._I("prefTabScreenCapturing"));
-      _chkExpandTab.setText(I18N._I("PreferencesWin.chkExpandTab.text"));
-      _lblTabWidth.setText(I18N._I("PreferencesWin.lblTabWidth.text"));
-      _lblFont.setText(I18N._I("PreferencesWin.lblFont.text"));
-      _lblFontSize.setText(I18N._I("PreferencesWin.lblFontSize.text"));
-      _tabPane.setTitleAt(1, I18N._I("PreferencesWin.paneTextEditing.tab.title"));
-      _chkAutoUpdate.setText(I18N._I("prefGeneralAutoCheck"));
-      _lblUpdates.setText(I18N._I("PreferencesWin.lblUpdates.text"));
-      _lblLanguage.setText(I18N._I("PreferencesWin.lblLanguage.text"));
-      _tabPane.setTitleAt(2, I18N._I("prefTabGeneralSettings"));
-      _btnOk.setText(I18N._I("ok"));
-      _btnCancel.setText(I18N._I("cancel"));
-      // JFormDesigner - End of component i18n initialization  //GEN-END:initI18n
-   }
-
-	// JFormDesigner - Variables declaration - DO NOT MODIFY  //GEN-BEGIN:variables
-   private JTabbedPane _tabPane;
-   private JTextField _txtHotkey;
-   private JLabel _lblHotkey;
-   private JLabel _lblDelay;
-   private JSpinner _spnDelay;
-   private JLabel _lblDelaySecs;
-   private JLabel _lblNaming;
-   private JRadioButton _radTimestamp;
-   private JRadioButton _radOCR;
-   private JRadioButton _radOff;
-   private JPanel _paneTextEditing;
-   private JCheckBox _chkExpandTab;
-   private JLabel _lblTabWidth;
-   private JComboBox _cmbFontName;
-   private JLabel _lblFont;
-   private JLabel _titleAppearance;
-   private JLabel _titleIndentation;
-   private JSpinner _spnTabWidth;
-   private JLabel _lblFontSize;
-   private JSpinner _spnFontSize;
-   private JCheckBox _chkAutoUpdate;
-   private JComboBox _cmbLang;
-   private JLabel _lblUpdates;
-   private JLabel _lblLanguage;
-   private JButton _btnOk;
-   private JButton _btnCancel;
-	// JFormDesigner - End of variables declaration  //GEN-END:variables
-}
-
-class LocaleListCellRenderer extends DefaultListCellRenderer {
-  public Component getListCellRendererComponent(JList list, 
-        Object value, int index, boolean isSelected, boolean hasFocus) {
-      Locale locale = (Locale) (value);
-      return super.getListCellRendererComponent(list, 
-            locale.getDisplayName(locale), index, isSelected, hasFocus);
-    }
-}
-
 
=== removed directory '.pc/native.patch'
=== removed directory '.pc/native.patch/sikuli-script'
=== removed directory '.pc/native.patch/sikuli-script/src'
=== removed directory '.pc/native.patch/sikuli-script/src/main'
=== removed directory '.pc/native.patch/sikuli-script/src/main/java'
=== removed directory '.pc/native.patch/sikuli-script/src/main/java/org'
=== removed directory '.pc/native.patch/sikuli-script/src/main/java/org/sikuli'
=== removed directory '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script'
=== removed file '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/Finder.java'
--- .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/Finder.java	2012-02-15 15:17:58 +0000
+++ .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/Finder.java	1970-01-01 00:00:00 +0000
@@ -1,195 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.script;
-
-import java.awt.*;
-import java.util.Iterator;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-
-import org.sikuli.script.natives.FindInput;
-import org.sikuli.script.natives.FindResult;
-import org.sikuli.script.natives.FindResults;
-import org.sikuli.script.natives.Mat;
-import org.sikuli.script.natives.TARGET_TYPE;
-import org.sikuli.script.natives.Vision;
-
-import com.wapmx.nativeutils.jniloader.NativeLoader;
-
-public class Finder implements Iterator<Match>{
-   private Region _region = null;
-   private Pattern _pattern = null;
-   private FindInput _findInput = new FindInput();
-   private FindResults _results = null;
-   private ImageLocator _imgLocator = null;
-   private int _cur_result_i;
-
-   static {
-      try{
-         NativeLoader.loadLibrary("VisionProxy");
-         Debug.info("Sikuli vision engine loaded.");
-      }
-      catch(IOException e){
-         e.printStackTrace();
-      }
-      //Vision.setParameter("GPU", 1);
-   }
-
-   public Finder __enter__(){
-      return this;
-   }
-
-   public void __exit__(Object type, Object value, Object trackback){
-      destroy();
-   }
-
-   /**
-    *  Finder constructor (finding within the desktop screen).
-    */
-   public Finder(String screenFilename) throws IOException{
-      this(screenFilename, null);
-   }
-
-   /**
-    *  Finder constructor (finding within the given region).
-    */
-   public Finder(String screenFilename, Region region) throws IOException{
-      String fname = findImageFile(screenFilename);
-      _findInput.setSource(fname);
-      _region = region;
-   }
-
-   /**
-    *  Finder constructor (finding within the given region).
-    */
-   public Finder(ScreenImage img, Region region){
-      Mat target = OpenCV.convertBufferedImageToMat(img.getImage());
-      _findInput.setSource(target);
-      _region = region;
-   }
-
-   public void __del__(){
-      destroy();
-   }
-
-   protected void finalize() throws Throwable {
-      destroy();
-   }
-
-   protected String findImageFile(String file) throws IOException{
-      if(_imgLocator == null)
-         _imgLocator = new ImageLocator();
-      return _imgLocator.locate(file);
-   }
-
-   protected <PSC> void setFindInput(PSC ptn) throws IOException{
-      if( ptn instanceof Pattern ){
-         _pattern = (Pattern)ptn;
-         Mat targetMat = OpenCV.convertBufferedImageToMat(_pattern.getImage());
-         _findInput.setTarget(targetMat);
-         _findInput.setSimilarity(_pattern.similarity);
-      }
-      else if( ptn instanceof String){
-         setTargetSmartly(_findInput, (String)ptn);
-         _findInput.setSimilarity(Settings.MinSimilarity);
-      }
-   }
-
-   protected void setTargetSmartly(FindInput fin, String target){
-      try{
-         //assume it's a file first
-         String filename = findImageFile(target);
-         fin.setTarget(TARGET_TYPE.IMAGE, filename);
-      }
-      catch(IOException e){
-         if(Util.isImageFile(target))
-            Debug.error(target + " looks like a file, but can't be found on the disk. Assume it's text." );
-         // this will init text recognizer on demand
-         TextRecognizer tr = TextRecognizer.getInstance();
-         //assume it's text 
-         fin.setTarget(TARGET_TYPE.TEXT, target);
-      }
-   }
-
-
-
-   /**
-    * void find( Pattern/String/PatternClass ) 
-    * finds the given pattern in the given ScreenImage.
-    */
-   public <PSC> void find(PSC ptn) throws IOException{
-      setFindInput(ptn);
-      _results = Vision.find(_findInput);
-      _cur_result_i = 0;
-   }
-
-   public void find(String templateFilename, double minSimilarity) throws IOException{
-      setTargetSmartly(_findInput, templateFilename);
-      _findInput.setSimilarity(minSimilarity);
-      _results = Vision.find(_findInput);
-      _cur_result_i = 0;
-   }
-
-   public <PSC> void findAll(PSC ptn) throws IOException {
-      Debug timing = new Debug();
-      timing.startTiming("Finder.findAll");
-
-      setFindInput(ptn);
-      _findInput.setFindAll(true);
-      _results = Vision.find(_findInput);
-      _cur_result_i = 0;
-
-      timing.endTiming("Finder.findAll");
-   }
-
-   public void findAll(String templateFilename, double minSimilarity) throws IOException {
-      Debug timing = new Debug();
-      timing.startTiming("Finder.findAll");
-
-      setTargetSmartly(_findInput, templateFilename);
-      _findInput.setSimilarity(minSimilarity);
-      _findInput.setFindAll(true);
-      _results = Vision.find(_findInput);
-      _cur_result_i = 0;
-
-      timing.endTiming("Finder.findAll");
-   }
-
-   public boolean hasNext(){
-      if(_results != null && _results.size() > _cur_result_i)
-         return true;
-      return false;
-   }
-
-
-   public Match next(){
-      Match ret = null;
-      if(hasNext()){
-         FindResult fr = _results.get(_cur_result_i++);
-         IScreen parentScreen = null;
-         if(_region != null)
-            parentScreen = _region.getScreen();
-         ret = new Match(fr, parentScreen);
-         if(_region != null){
-            ret = _region.toGlobalCoord(ret);
-         }
-         if(_pattern != null){
-            Location offset = _pattern.getTargetOffset();
-            ret.setTargetOffset(offset);
-         }
-      }
-      return ret;
-   }
-
-   public void remove(){
-   }
-
-   public void destroy(){  
-   }
-
-}
-
 
=== removed file '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java'
--- .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	2012-02-15 15:17:58 +0000
+++ .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.script;
-
-import java.awt.image.*;
-import java.io.*;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.LinkedList;
-
-import org.sikuli.script.natives.Mat;
-import org.sikuli.script.natives.Vision;
-import org.sikuli.script.natives.OCRWord;
-import org.sikuli.script.natives.OCRWords;
-
-import com.wapmx.nativeutils.jniloader.NativeLoader;
-
-// Singleton
-public class TextRecognizer {
-   protected static TextRecognizer _instance = null;
-
-   static {
-      try{
-         NativeLoader.loadLibrary("VisionProxy");
-         TextRecognizer tr = TextRecognizer.getInstance();
-      }
-      catch(IOException e){
-         e.printStackTrace();
-      }
-   }
-
-   protected TextRecognizer(){
-      init();
-   }
-   
-   boolean _init_succeeded = false;
-
-   public void init(){
-      Debug.info("Text Recognizer inited.");
-      try{
-         String path = ResourceExtractor.extract("tessdata");
-         // TESSDATA_PREFIX doesn't contain tessdata/
-         if(path.endsWith("tessdata/"))
-            path = path.substring(0,path.length()-9);
-         Settings.OcrDataPath = path;
-         Debug.log(3, "OCR data path: " + path);
-
-         Vision.initOCR(Settings.OcrDataPath);
-         _init_succeeded = true;
-      }
-      catch(IOException e){
-         e.printStackTrace();
-      }catch(Exception e){
-         e.printStackTrace();         
-      }
-   }
-
-   public static TextRecognizer getInstance(){
-      if(_instance==null)
-         _instance = new TextRecognizer();
-      return _instance;
-   }
-
-   public enum ListTextMode {
-      WORD, LINE, PARAGRAPH
-   };
-
-   public List<Match> listText(ScreenImage simg, Region parent){
-      return listText(simg, parent, ListTextMode.WORD);
-   }
-
-   //TODO: support LINE and PARAGRAPH
-   // listText only supports WORD mode now.
-   public List<Match> listText(ScreenImage simg, Region parent, ListTextMode mode){
-      Mat mat = OpenCV.convertBufferedImageToMat(simg.getImage());
-      OCRWords words = Vision.recognize_as_ocrtext(mat).getWords();
-      List<Match> ret = new LinkedList<Match>();
-      for(int i=0;i<words.size();i++){
-         OCRWord w = words.get(i);
-         Match m = new Match(parent.x+w.getX(), parent.y+w.getY(), w.getWidth(), w.getHeight(), 
-                             w.getScore(), parent.getScreen(), w.getString());
-         ret.add(m);
-      }
-      return ret;
-   }
-
-
-   public String recognize(ScreenImage simg){
-      BufferedImage img = simg.getImage();
-      return recognize(img);
-   }
-
-   public String recognize(BufferedImage img){
-      if (_init_succeeded){
-         Mat mat = OpenCV.convertBufferedImageToMat(img);
-         return Vision.recognize(mat).trim();
-      }else{
-         return "";
-      }
-   }
-
-   public String recognizeWord(ScreenImage simg){
-      BufferedImage img = simg.getImage();
-      return recognizeWord(img);
-   }
-
-   public String recognizeWord(BufferedImage img){
-      if (_init_succeeded){
-         Mat mat = OpenCV.convertBufferedImageToMat(img);
-         return Vision.recognizeWord(mat).trim();
-      }else{
-         return "";
-      }
-   }
-}
-
 
=== removed file '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java'
--- .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java	2011-10-04 00:57:09 +0000
+++ .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.script;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.util.Vector;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
-import com.wapmx.nativeutils.jniloader.NativeLoader;
-
-public class VDictProxy<T> {
-   private long _instance;
-   private Map<Integer, T> _i2obj = new HashMap<Integer, T>();
-
-   static {
-      // load libScreenMatchProxy.{so,jnilib}
-      //System.loadLibrary("ScreenMatchProxy");
-      try{
-         NativeLoader.loadLibrary("VDictProxy");
-         Debug.info("VDictProxy loaded.");
-      }
-      catch(IOException e){
-         e.printStackTrace();
-      }
-   }
-
-   public VDictProxy(){
-      _instance = getInstance();
-   }
-
-   private native long getInstance();
-
-   private String getAbsolutePath(String filename) throws FileNotFoundException{
-      if(new File(filename).exists())
-         return filename;
-      filename = Settings.BundlePath + File.separator + filename;
-      if(new File(filename).exists())
-         return filename;
-      throw new FileNotFoundException("No such file: " + filename);
-   }
-
-   // insert an (key,value) entry using an image key
-   public void insert(String imagekey_filename, T value) throws FileNotFoundException {
-      imagekey_filename = getAbsolutePath(imagekey_filename);
-      int hash = value.hashCode();
-      while(true){
-         if( hash != -1 && !_i2obj.containsKey(hash) ){
-            _i2obj.put(hash, value);
-            break;
-         }
-         else{
-            hash += (int)(Math.random()*100);
-         }
-      }
-      _insert(_instance, imagekey_filename, hash);
-   }
-
-   public native void _insert(long instance, String imagekey_filename, int value);
-
-   // lookup the entry using an image key (exact match)
-   public T lookup(String imagekey_filename) throws FileNotFoundException{
-      imagekey_filename = getAbsolutePath(imagekey_filename);
-      int hash = _lookup(_instance, imagekey_filename);
-      if(hash==-1) return null;
-      return _i2obj.get(hash);
-   }
-
-   private native int _lookup(long instance, String imagekey_filename);
-
-   // lookup the first entry with a similar image key
-   public T lookup_similar(String imagekey_filename, double similarity_threshold) throws FileNotFoundException{
-      imagekey_filename = getAbsolutePath(imagekey_filename);
-      int hash = _lookup_similar(_instance, imagekey_filename, similarity_threshold);
-      if(hash==-1) return null;
-      return _i2obj.get(hash);
-   }
-
-   private native int _lookup_similar(long instance, String imagekey_filename, double similarity_threshold);
-
-   // lookup at most n entries with keys similar to the given image (n = 0 : all)
-   public List<T> lookup_similar_n(String imagekey_filename, double similarity_threshold, int n) throws FileNotFoundException{
-      imagekey_filename = getAbsolutePath(imagekey_filename);
-      int h[] = _lookup_similar_n(_instance, imagekey_filename, similarity_threshold, n);
-      List<T> ret = new Vector<T>(h.length);
-      for(int i=0;i<h.length;i++){
-         if(h[i] == -1)
-            ret.add(i, null);
-         else
-            ret.add(i, _i2obj.get(h[i]));
-      }
-      return ret;
-   }
-
-   private native int[] _lookup_similar_n(long instance, String imagekey_filename, double similarity_threshold, int n);
-
-   // erase the entry associated with the image
-   public void erase(String imagekey_filename) throws FileNotFoundException{
-      imagekey_filename = getAbsolutePath(imagekey_filename);
-      int h = _lookup(_instance, imagekey_filename);
-      if(h!=-1)   _i2obj.remove(h);
-      _erase(_instance, imagekey_filename);
-   }
-
-   private native void _erase(long _instance, String imagekey_filename);
-
-   public int size(){   return _size(_instance); }
-   private native int _size(long instance);  // return the number of image keys stored
-
-   public boolean empty(){ return _empty(_instance);  }
-   private native boolean _empty(long instance); // test whether it is empty
-}
-
 
=== removed directory '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal'
=== removed directory '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey'
=== removed file '.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java'
--- .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java	2011-10-04 00:57:09 +0000
+++ .pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-package org.sikuli.script.internal.hotkey;
-
-import java.lang.reflect.*;
-import java.awt.Event;
-import java.awt.event.*;
-import java.util.*;
-import java.io.IOException;
-
-import org.sikuli.script.Debug;
-import org.sikuli.script.HotkeyListener;
-import org.sikuli.script.HotkeyEvent;
-
-import com.wapmx.nativeutils.jniloader.NativeLoader;
-import jxgrabkey.HotkeyConflictException;
-import jxgrabkey.JXGrabKey;
-
-public class LinuxHotkeyManager extends HotkeyManager {
-   static{
-      try{
-         NativeLoader.loadLibrary("JXGrabKey");
-      }
-      catch(IOException e){
-         Debug.error("Can't load native lib JXGrabKey");
-         e.printStackTrace();
-      }
-   }
-
-   class HotkeyData {
-      int key, modifiers;
-      HotkeyListener listener;
-
-      public HotkeyData(int key_, int mod_, HotkeyListener l_){
-         key = key_;
-         modifiers = mod_;
-         listener = l_;
-      }
-   };
-
-   class MyHotkeyHandler implements jxgrabkey.HotkeyListener{
-      public void onHotkey(int id){
-         Debug.log(4, "Hotkey pressed");
-         HotkeyData data = _idCallbackMap.get(id);
-         HotkeyEvent e = new HotkeyEvent(data.key, data.modifiers);
-         data.listener.invokeHotkeyPressed(e);
-      }
-   };
-
-   private Map<Integer, HotkeyData> _idCallbackMap = new HashMap<Integer,HotkeyData >();
-   private int _gHotkeyId = 1;
-
-   public boolean _addHotkey(int keyCode, int modifiers, HotkeyListener listener){
-      JXGrabKey grabKey = JXGrabKey.getInstance();
-
-      if(_gHotkeyId == 1){
-         grabKey.addHotkeyListener(new MyHotkeyHandler());
-      }
-
-      _removeHotkey(keyCode, modifiers);
-      int id = _gHotkeyId++;
-      HotkeyData data = new HotkeyData(keyCode, modifiers, listener);
-      _idCallbackMap.put(id, data);
-
-      try{
-         //JXGrabKey.setDebugOutput(true);
-         grabKey.registerAwtHotkey(id, modifiers, keyCode);
-      }catch(HotkeyConflictException e){
-         Debug.error("Hot key conflicts");
-         return false;
-      }
-      return true;
-   }
-
-   public boolean _removeHotkey(int keyCode, int modifiers){
-      for( Map.Entry<Integer, HotkeyData> entry : _idCallbackMap.entrySet() ){
-         HotkeyData data = entry.getValue();
-         if(data.key == keyCode && data.modifiers == modifiers){
-            JXGrabKey grabKey = JXGrabKey.getInstance();
-            int id = entry.getKey();
-            grabKey.unregisterHotKey(id); 
-            _idCallbackMap.remove(id);
-            return true;
-         }
-      }
-      return false;
-   }
-
-
-   public void cleanUp(){
-      JXGrabKey grabKey = JXGrabKey.getInstance();
-      for( Map.Entry<Integer, HotkeyData> entry : _idCallbackMap.entrySet() ){
-         int id = entry.getKey();
-         grabKey.unregisterHotKey(id); 
-      }
-      _gHotkeyId = 1;
-      _idCallbackMap.clear();
-      grabKey.getInstance().cleanUp(); 
-   }
-
-}
-
-
 
=== removed directory '.pc/native.patch/sikuli-script/src/main/native'
=== removed file '.pc/native.patch/sikuli-script/src/main/native/vision.i'
--- .pc/native.patch/sikuli-script/src/main/native/vision.i	2012-02-15 15:17:58 +0000
+++ .pc/native.patch/sikuli-script/src/main/native/vision.i	1970-01-01 00:00:00 +0000
@@ -1,264 +0,0 @@
-%module VisionProxy
-%{
-#include "vision.h"
-#include "sikuli-debug.h"
-#include <iostream>
-#include "opencv.hpp"
-#include "cvgui.h"
-#include "tessocr.h"
-%}
-
-%include "std_vector.i"
-%include "std_string.i"
-%include "typemaps.i"
-%include "various.i"
-
-%pragma(java) jniclassimports=%{
-   import com.wapmx.nativeutils.jniloader.NativeLoader;
-%}
-
-%pragma(java) jniclasscode=%{
-   static {
-      try {
-         NativeLoader.loadLibrary("VisionProxy");
-      } catch (Exception e) {
-         System.err.println("Failed to load VisionProxy.\n" + e);
-      }
-   }
-%}
-
-
-%template(FindResults) std::vector<FindResult>;
-
-%template(OCRChars) std::vector<OCRChar>;
-%template(OCRWords) std::vector<OCRWord>;
-%template(OCRLines) std::vector<OCRLine>;
-%template(OCRParagraphs) std::vector<OCRParagraph>;
-
-%typemap(jni) unsigned char*        "jbyteArray"
-%typemap(jtype) unsigned char*      "byte[]"
-%typemap(jstype) unsigned char*     "byte[]"
-
-// Map input argument: java byte[] -> C++ unsigned char *
-%typemap(in) unsigned char* {
-   long len = JCALL1(GetArrayLength, jenv, $input);
-   $1 = (unsigned char *)malloc(len + 1);
-   if ($1 == 0) {
-      std::cerr << "out of memory\n";
-      return 0;
-   }
-   JCALL4(GetByteArrayRegion, jenv, $input, 0, len, (jbyte *)$1);
-}
-
-%typemap(freearg) unsigned char* %{
-   free($1);
-%}
-
-// change Java wrapper output mapping for unsigned char*
-%typemap(javaout) unsigned char* {
-    return $jnicall;
- }
-
-%typemap(javain) unsigned char* "$javainput" 
-
-
-struct FindResult {
-   int x, y;
-   int w, h;
-   double score;
-   FindResult(){
-      x=0;y=0;w=0;h=0;score=-1;text = "";
-   }
-   FindResult(int _x, int _y, int _w, int _h, double _score){
-      x = _x; y = _y;
-      w = _w; h = _h;
-      score = _score;
-      text = "";
-   }
-   
-   std::string text;
-};
-
-class OCRRect {
-   
-public:
-   
-   OCRRect();
-   OCRRect(int x_, int y_, int width_, int height_);
-   
-   int x;
-   int y;
-   int height;
-   int width;
-   
-};
-
-class OCRChar : public OCRRect{
-   
-public:
-   
-   OCRChar(const std::string& ch_, int x_, int y_, int width_, int height_)
-   : ch(ch_), OCRRect(x_,y_,width_,height_){};
-   
-   std::string ch;
-};
-
-class OCRWord : public OCRRect {
-   
-public:
-   float score;
-   std::string getString();
-   
-   std::vector<OCRChar> getChars();
-};
-
-class OCRLine : public OCRRect{
-public:
-   
-   std::string getString();
-   std::vector<OCRWord> getWords();
-   
-};
-
-class OCRParagraph : public OCRRect{
-public:  
-   
-   std::vector<OCRLine> getLines();
-   
-};
-
-class OCRText : public OCRRect{
-   
-public:   
-   
-   std::string getString();
-   
-   std::vector<OCRWord> getWords();
-   std::vector<OCRParagraph> getParagraphs();
-   
-};
-
-class Blob : public cv::Rect{
-   
-public:
-
-   Blob(){};
-   Blob(const cv::Rect& rect);
-   
-   bool isContainedBy(Blob& b);
-   
-   double area;
-   int mb;
-   int mg;
-   int mr;
-   int score;
-};
-
-%include "enumtypeunsafe.swg"
-%javaconst(1);
-enum TARGET_TYPE{
-   IMAGE,
-   TEXT,
-   BUTTON
-};
-
-namespace sikuli {
-   
-   class FindInput{
-      
-   public:
-      
-      FindInput();
-      FindInput(cv::Mat source, cv::Mat target);
-      FindInput(cv::Mat source, int target_type, const char* target);
-      
-      FindInput(const char* source_filename, int target_type, const char* target);
-      
-      FindInput(cv::Mat source, int target_type);
-      FindInput(const char* source_filename, int target_type);
-      
-      // copy everything in 'other' except for the source image
-      FindInput(cv::Mat source, const FindInput other);
-      
-      void setSource(const char* source_filename);
-      void setTarget(int target_type, const char* target_string);
-      
-      void setSource(cv::Mat source);
-      void setTarget(cv::Mat target);
-      
-      cv::Mat getSourceMat();
-      cv::Mat getTargetMat();
-      
-      void setFindAll(bool all);
-      bool isFindingAll();
-      
-      void setLimit(int limit);
-      int getLimit();
-      
-      void setSimilarity(double similarity);
-      double getSimilarity();
-      
-      int getTargetType();
-      
-      std::string getTargetText();
-   };
-   
-   class Vision{
-   public:
-      
-      static std::vector<FindResult> find(FindInput q);
-      static std::vector<FindResult> findChanges(FindInput q);
-
-      static double compare(cv::Mat m1, cv::Mat m2);
-      
-      static void initOCR(const char* ocrDataPath);
-      
-      static std::string query(const char* index_filename, cv::Mat image);
-            
-      static OCRText recognize_as_ocrtext(cv::Mat image);
-      
-      static std::vector<FindResult> findBlobs(const cv::Mat& image, bool textOnly=false);
-
-      static std::vector<FindResult> findTextBlobs(const cv::Mat& image);
-      
-      static std::string recognize(cv::Mat image);
-      static std::string recognizeWord(cv::Mat image);
-      
-      //helper functions
-      static cv::Mat createMat(int _rows, int _cols, unsigned char* _data);
-
-      static void setParameter(std::string param, float val);
-      static float getParameter(std::string param);
-      
-   private:   
-      
-   };
-   
-
-   enum DebugCategories {
-      OCR, FINDER
-   };
-   void setDebug(DebugCategories cat, int level);
-
-
-
-}
-
-class OCR {
-public:
-   static void setParameter(std::string param, std::string value);
-};
-
-
-namespace cv{
-   class Mat {
-     int _w, _h;
-     unsigned char* _data;
-
-   public:
-     //Mat(int _rows, int _cols, int _type, unsigned char* _data);
-   };
-
-}
-
-
 
=== removed directory '.pc/no-opencv-surf-module.patch'
=== removed directory '.pc/no-opencv-surf-module.patch/sikuli-script'
=== removed directory '.pc/no-opencv-surf-module.patch/sikuli-script/src'
=== removed directory '.pc/no-opencv-surf-module.patch/sikuli-script/src/main'
=== removed directory '.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native'
=== removed file '.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/cvgui.cpp'
--- .pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/cvgui.cpp	2012-06-25 12:33:23 +0000
+++ .pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/cvgui.cpp	1970-01-01 00:00:00 +0000
@@ -1,2508 +0,0 @@
-/*
- * Copyright 2010-2011, Sikuli.org
- * Released under the MIT License.
- *
- */
-#include "cvgui.h"
-#include "sikuli-debug.h"
-#include <iostream>
-using namespace std;
-using namespace sikuli;
-
-
-Scalar Color::RED(0,0,255);
-Scalar Color::WHITE(255,255,255);
-
-Scalar Color::RANDOM() { 
-   return Scalar(rand()&255, rand()&255, rand()&255);
-};
-
-static bool sort_by_x (Rect a, Rect b){ 
-	return (a.x < b.x); 
-}
-
-static bool sort_blob_by_x(Blob a, Blob b){ 
-	return (a.x < b.x); 
-}
-
-static bool sort_blob_by_y(Blob a, Blob b){ 
-	return (a.y < b.y); 
-}
-
-#define SHOW(x) namedWindow(#x,1); imshow(#x,x);
-#define SHOW0(x) namedWindow(#x,1); imshow(#x,x); waitKey(0);
-
-//class VisualLogger{
-//   
-//   
-//   int image_i;
-//   int step_i;
-//   char* prefix;
-//   
-//public:
-//   
-//   VisualLogger(){
-//   }
-//   
-//   static void newImage(){
-//      image_i++;
-//      step_i = 0;
-//   }
-//   
-//   static void log(const char* name, const Mat& image){
-//      char buf[200];
-//      
-//      if (prefix){
-//         
-//         sprintf(buf, "%s-%02d-%s.vlog.png", prefix, step_i, name);
-//         
-//      }else{
-//         sprintf(buf, "%03d-%02d-%s.vlog.png",image_i,step_i,name);           
-//      }
-//      
-//      imwrite(buf, image);
-//      
-//      step_i++;  
-//   }
-//};
-//
-//static VisualLogger vlog;
-
-int VisualLogger::image_i = 0;
-int VisualLogger::step_i = 0;
-//bool VisualLogger::enabled = false;
-char* VisualLogger::prefix = 0;
-
-//#define VLOG(x,y) 
-
-void
-Util::rgb2grayC3(const Mat& input, Mat& output){
-   Mat g;
-   cvtColor(input, g, CV_RGB2GRAY);   
-   Mat ss[3] = {g,g,g};
-   merge(ss,3,output);   
-}
-
-void 
-Util::growRect(Rect& rect, int xd, int yd, Rect bounds){
-   
-   
-   Rect in = rect;
-   in.x -= xd;
-   in.width += 2*xd;
-   in.y -= yd;
-   in.height += 2*yd;
-   
-   int x1 = max(bounds.x, in.x);
-   int y1 = max(bounds.y, in.y);
-   int x2 = min(in.x + in.width, bounds.width);
-   int y2 = min(in.y + in.height, bounds.height);
-	
-   if (x2 < x1 || y2 < y1)
-      rect = Rect(0,0,0,0);
-   else
-      rect = Rect(x1,y1,x2-x1+1,y2-y1+1);
-   
-}
-
-void 
-Util::growRect(Rect& rect, int xd, int yd, cv::Mat image){
-   growRect(rect, xd, yd, Rect(0,0, image.cols-1, image.rows-1));
-}
-
-
-
-void 
-Painter::drawRect(Mat& image, Rect r, Scalar color){
-   rectangle(image, 
-             Point(r.x, r.y),
-             Point(r.x + r.width, r.y + r.height),
-             color);   
-}
-
-void 
-Painter::drawRect(Mat& image, OCRRect r, Scalar color){
-   rectangle(image, 
-             Point(r.x, r.y),
-             Point(r.x + r.width, r.y + r.height),
-             color);   
-}
-
-void 
-Painter::drawRects(Mat& image, vector<Rect>& rects, Scalar color){
-   for (vector<Rect>::iterator r = rects.begin();
-        r != rects.end(); ++r){
-      
-      rectangle(image, 
-                Point(r->x, r->y),
-                Point(r->x + r->width, r->y + r->height),
-                color);
-   }
-}
-
-
-
-void 
-Painter::drawBlobsRandomShading(Mat& image, vector<Blob>& blobs){
-
-   
-   Mat blank = image.clone();
-   blank = 0.0;
-   
-   Mat shading = blank;
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){   
-      Blob& box = *it;      
-      rectangle(shading, Point(box.x,box.y), Point(box.x+box.width,box.y+box.height), Color::RANDOM(), CV_FILLED);
-   }
-   
-   image = image * 0.5 + shading * 0.7;
-   
-   Painter::drawBlobs(image, blobs, Color::WHITE);
-}
-
-void 
-Painter::drawRects(Mat& image, vector<Rect>& rects){
-   drawRects(image, rects, Scalar(0,0,255));
-}
-
-void 
-Painter::drawBlobs(Mat& image, vector<Blob>& blobs){
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      
-      Scalar color(blob.mr,blob.mg,blob.mb);
-      vector<Rect> rs;
-      rs.push_back(blob);
-      drawRects(image, rs, color);
-   }
-}
-
-void 
-Painter::drawBlobs(Mat& image, vector<Blob>& blobs, Scalar color){
-   vector<Rect> rs;
-
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      rs.push_back(blob);
-   }
-   drawRects(image, rs, color);
-}
-
-void 
-Painter::drawLineBlobs(Mat& image, vector<LineBlob>& lineblobs, Scalar color){
-   for (vector<LineBlob>::iterator it1 = lineblobs.begin();
-        it1 != lineblobs.end(); ++it1){
-      
-      LineBlob& lineblob = *it1;
-      
-      
-      if (lineblob.blobs.size()>=2){
-         
-         for (vector<Blob>::iterator r = lineblob.blobs.begin() + 1;
-              r != lineblob.blobs.end(); ++r){
-            
-            Rect previous = *(r-1);
-            Rect current = *r;
-            
-            Point from(previous.x+previous.width,previous.y);
-            Point to(current.x,current.y);            
-            cv::line(image, from, to, Scalar(255,255,255));
-         }
-      }
-      
-      drawRect(image, lineblob, color);
-   }
-}
-
-void 
-Painter::drawParagraphBlobs(Mat& image, vector<ParagraphBlob> blobs, Scalar color){
-   for (vector<ParagraphBlob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      ParagraphBlob& parablob = *it;      
-      for (vector<LineBlob>::iterator it1 = parablob.lineblobs.begin();
-           it1 != parablob.lineblobs.end(); ++it1){
-         
-         LineBlob& lineblob = *it1;
-         drawRect(image, lineblob, Scalar(255,255,0));
-      }
-      
-      drawRect(image, parablob, Scalar(0,0,255));
-      
-   }
-}
-
-void 
-Painter::drawOCRWord(Mat& ocr_result_image, OCRWord ocrword){
-   
-   cout << ocrword.x << " " << ocrword.y <<  " " << ocrword.width <<  " " << ocrword.height << ": ";
-   cout << ocrword.getString() << endl;
-  
-   drawRect(ocr_result_image, ocrword, Scalar(255,255,0));
-   Point pt(ocrword.x, ocrword.y + ocrword.height - 10);      
-   putText(ocr_result_image, ocrword.getString(), pt,  
-     FONT_HERSHEY_SIMPLEX, 0.4, Color::RED);
-
-}
-
-void 
-Painter::drawOCRLine(Mat& ocr_result_image, OCRLine ocrline){
-   vector<OCRWord> ocrwords = ocrline.getWords();
-   for (vector<OCRWord>::iterator it = ocrwords.begin(); it != ocrwords.end(); ++it){
-      OCRWord& ocrword = *it;
-      drawOCRWord(ocr_result_image, ocrword);
-   }
-}
-
-void 
-Painter::drawOCRParagraph(Mat& ocr_result_image, OCRParagraph ocrpara){
-   vector<OCRLine> ocrlines = ocrpara.getLines();
-   for (vector<OCRLine>::iterator it = ocrlines.begin(); it != ocrlines.end(); ++it){
-      OCRLine& ocrline = *it;
-      drawOCRLine(ocr_result_image, ocrline);
-   }
-}
-
-void 
-Painter::drawOCRText(Mat& ocr_result_image, OCRText ocrtext){
-   vector<OCRParagraph> ocrparas = ocrtext.getParagraphs();
-   for (vector<OCRParagraph>::iterator it = ocrparas.begin(); it != ocrparas.end(); ++it){
-      OCRParagraph& ocrpara = *it;
-      drawOCRParagraph(ocr_result_image, ocrpara);
-   }
-}
-
-
-
-
-void
-LineBlob::merge(LineBlob& blob){
-   
-   for (vector<Blob>::iterator it = blob.blobs.begin();
-        it != blob.blobs.end(); ++it){
-      add(*it);
-   }
-   
-}
-
-void
-LineBlob::updateBoundingRect(Blob& blob){
-   if (blobs.size() == 0){
-      x = blob.x;
-      y = blob.y;
-      height = blob.height;
-      width = blob.width;
-      
-   }else{
-      
-      int x1,y1,x2,y2;
-      x1 = min(x, blob.x);
-      y1 = min(y, blob.y);
-      x2 = max(x+width, blob.x + blob.width);
-      y2 = max(y+height, blob.y + blob.height);
-      
-      x = x1;
-      y = y1;
-      height = y2 - y1;
-      width = x2 - x1;
-   }
-}
-
-void
-LineBlob::add(Blob& blob){
-   updateBoundingRect(blob);
-   blobs.push_back(blob);
-}
-
-void
-LineBlob::calculateBoundingRectangle(){
-   int x1,y1,x2,y2;
-   Blob& first_blob = blobs.front();
-   x1 = first_blob.x;
-   x2 = first_blob.x + first_blob.width;
-   y1 = first_blob.y;
-   y2 = first_blob.y + first_blob.height;
-   
-   for (vector<Blob>::iterator it_line = blobs.begin()+1; 
-        it_line != blobs.end(); ++it_line){
-      Blob& b = *it_line;
-      x1 = min(x1, b.x);
-      y1 = min(y1, b.y);
-      x2 = max(x2, b.x + b.width);
-      y2 = max(y2, b.y + b.height);
-   }
-   
-   x = x1;
-   y = y1;
-   height = y2 - y1;
-   width = x2 - x1;
-}
-
-void
-ParagraphBlob::add(LineBlob& blob){
-   
-   if (lineblobs.size() == 0){
-      x = blob.x;
-      y = blob.y;
-      height = blob.height;
-      width = blob.width;
-      
-   }else{
-      
-      int x1,y1,x2,y2;
-      x1 = min(x, blob.x);
-      y1 = min(y, blob.y);
-      x2 = max(x+width, blob.x + blob.width);
-      y2 = max(y+height, blob.y + blob.height);
-      
-      x = x1;
-      y = y1;
-      height = y2 - y1;
-      width = x2 - x1;
-   }
-   lineblobs.push_back(blob);
-}
-
-
-
-void denoise(Mat& src){
-   
-   //src = src * 0.1;
-   
-   Mat kernel = Mat::ones(3,3,CV_32FC1);
-   kernel.at<float>(2,2) = 0;
-   
-   Mat srcF, destF;
-   src.convertTo(srcF, CV_32FC1, 0.1);
-   
-   filter2D(srcF, destF, -1, kernel);
-   
-   Mat destU;
-   destF.convertTo(destU, CV_8UC1);
-   
-   threshold(destU, destU, 60, 255, THRESH_BINARY);
-   
-   bitwise_and(src, destU, src);
-}
-
-
-
-
-void
-cvgui::linkLineBlobsIntoPagagraphBlobs(vector<LineBlob>& blobs, vector<ParagraphBlob>& parablobs){
-   
-   sort(blobs, sort_blob_by_y);
-   
-   for (vector<LineBlob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      LineBlob& blob = *it;
-      
-      vector<ParagraphBlob>::iterator it1;
-      for (it1 = parablobs.begin(); 
-           it1 != parablobs.end(); ++it1){
-         
-         ParagraphBlob& parablob = *it1;
-         
-         bool left_aligned = abs(parablob.x - blob.x) < 10;
-         bool small_vertical_spacing = abs(blob.y - (parablob.y + parablob.height)) < 15;
-         
-         bool same_paragraph = left_aligned & small_vertical_spacing; 
-         
-         if (same_paragraph){
-            parablob.add(blob);
-            break;
-         }
-      }
-      
-      if (it1 ==  parablobs.end()){
-         ParagraphBlob new_parablob;
-         new_parablob.add(blob);
-         parablobs.push_back(new_parablob);
-      }
-   }
-}
-
-void
-cvgui::mergeLineBlobs(vector<LineBlob>& blobs, vector<LineBlob>& merged_blobs){
-   
-   sort(blobs, sort_blob_by_x);
-   
-   for (vector<LineBlob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      LineBlob& blob = *it;
-      
-      vector<LineBlob>::iterator l;
-      for (l = merged_blobs.begin(); l != merged_blobs.end(); ++l){
-         
-         LineBlob& merged_blob = *l;
-         
-         bool similar_baseline = abs((merged_blob.y + merged_blob.height) - (blob.y + blob.height)) < 5;
-         bool small_spacing = (blob.x - (merged_blob.x + merged_blob.width)) < 10;
-         
-         bool cond1 = merged_blob.isContainedBy(blob) || blob.isContainedBy(merged_blob);
-         
-         bool same_line = cond1 || (similar_baseline && small_spacing);
-         
-         if (same_line){
-            merged_blob.merge(blob);
-            break;
-         }
-      }
-      
-      if (l == merged_blobs.end()){
-         merged_blobs.push_back(blob);
-      }
-      
-   }
-}
-
-void
-cvgui::linkBlobsIntoLineBlobs(vector<Blob>& blobs, vector<LineBlob>& lines, int max_spacing){
-   
-   
-   sort(blobs, sort_blob_by_x);
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      
-      vector<LineBlob>::iterator l;
-      for (l = lines.begin(); l != lines.end(); ++l){
-         
-         LineBlob& line = *l;
-         Blob& last = line.blobs.back();
-         
-         bool similar_baseline = abs((last.y + last.height) - (blob.y + blob.height)) < 5;
-         bool similar_centerline = abs((last.y + last.height/2) - (blob.y + blob.height/2)) < 5;
-         bool similar_height = 1.0*min(last.height,blob.height)/max(last.height,blob.height) > 0.5;
-         bool similar_width = 1.0*min(last.width,blob.width)/max(last.width,blob.width) > 0.5;
-         
-         bool small_overlap = blob.x > ((last.x + last.width)-2);
-         
-         
-         bool small_spacing = (blob.x - (last.x + last.width)) < max_spacing;
-         
-         bool is_dot = blob.height < 3 && blob.width < 3 && similar_baseline && small_spacing;
-         
-         int th = 40;
-         bool similar_foreground_color = 
-         abs(last.mr - blob.mr) < th && abs(last.mg - blob.mg) < th && abs(last.mb - blob.mb) < th;
-         
-         
-         //bool is_probably_i = blob.width < 2 || last.width < 2;
-         
-         
-         bool same_line = (similar_centerline || similar_baseline)
-         && similar_height
-         && small_overlap
-         //&& similar_width
-         && small_spacing
-         && similar_foreground_color; //|| is_probably_i);
-         
-         
-         bool very_close = (blob.x - (last.x + last.width)) < 3;
-         
-         //         bool vertically_overlap = similar_baseline;
-         
-         if (same_line || (very_close && similar_height && similar_baseline)){
-            line.add(blob);
-            break;
-         }
-      }
-      
-      if (l == lines.end()){
-         
-         LineBlob newline;
-         newline.add(blob);
-         lines.push_back(newline);
-      }
-      
-   }
-}
-
-
-void 
-cvgui::run_ocr_on_lineblobs(vector<LineBlob>& ocr_input_lineblobs,
-                            Mat& input_image,
-                            vector<OCRLine>& ocrlines){
-   
-   
-   for (vector<LineBlob>::iterator it = ocr_input_lineblobs.begin(); 
-        it != ocr_input_lineblobs.end(); ++it){
-      
-      LineBlob& lineblob = *it;
-      OCRLine ocrline;
-      OCRWord ocrword;
-      
-      // if (lineblob.blobs.size()<10)
-      //         continue;
-      //      
-      
-      
-      Mat wordImage(input_image,lineblob);
-      
-      Mat ocrImage;  // the image passed to tesseract      
-      bool upsampled = false;
-      if (wordImage.rows < 20){
-         upsampled = true;
-         resize(wordImage, ocrImage, Size(wordImage.cols*2,wordImage.rows*2));
-      }else {
-         ocrImage = wordImage.clone(); 
-      }  
-      
-      vector<OCRChar> ocr_chars;
-      ocr_chars = OCR::recognize((unsigned char*)ocrImage.data,
-                                            ocrImage.cols,
-                                            ocrImage.rows,
-                                            8); 
-      
-      for (vector<OCRChar>::iterator iter = ocr_chars.begin(); 
-           iter != ocr_chars.end(); iter++){
-         
-         
-         OCRChar& ocrchar = *iter;
-         
-         
-         if (upsampled){
-            // scale back the coordinates in the OCR result
-            
-            ocrchar.x = ocrchar.x/2;
-            ocrchar.y = ocrchar.y/2;
-            ocrchar.width = ocrchar.width/2;
-            ocrchar.height = ocrchar.height/2;
-         }
-         
-         
-         ocrchar.x += lineblob.x;
-         ocrchar.y += lineblob.y;
-         
-         
-         
-         if (iter > ocr_chars.begin()){
-            OCRChar& previous_ocrchar = *(iter-1);
-            
-            int spacing = ocrchar.x - (previous_ocrchar.x + previous_ocrchar.width);
-            //dout() << '[' << ocrchar.height << ':' << spacing << ']';
-            //dout() << '[' << spacing << ']';
-            
-            
-            if (lineblob.height > 6 && spacing >= 4){// || spacing >= 2){
-               ocrline.addWord(ocrword);
-               ocrword.clear();               
-               //dout() << ' ';
-            }
-         } 
-         
-         //dout() << ocrchar.ch;
-         
-         ocrword.add(ocrchar);
-         ocrword.y = lineblob.y;
-         ocrword.height = lineblob.height;
-         
-         
-         
-         
-         
-      }
-      
-      
-      ocrline.addWord(ocrword);
-      
-      //dout() << endl;
-      
-      
-      ocrlines.push_back(ocrline);
-      
-   }
-}
-
-void getLeafBlobs(vector<Blob>& blobs, vector<Blob>& leaf_blobs){
-   
-   leaf_blobs.clear();
-   
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& a = *it;
-      
-      // check if blob 'a' contains any other blob
-      vector<Blob>::iterator it1;
-      for (it1 = blobs.begin(); 
-           it1 != blobs.end(); ++it1){
-         
-         Blob& b = *it1;
-         
-         if (it != it1 && b.isContainedBy(a))
-            break;
-      }
-      
-      // if not, it is a leave blob
-      if (it1 == blobs.end())
-         leaf_blobs.push_back(a);
-         
-   }
-}
-
-
-Mat
-cvgui::findBoxesByVoting(const Mat& screen, 
-                         int bw, int bh,
-                         vector<Blob>& output_blobs){
-
-   Mat dark;
-   Util::rgb2grayC3(screen,dark);
-   dark = dark * 0.5;
-   
-   
-   VLOG("Input", screen);
-   
-   Mat gray;
-   cvtColor(screen,gray,CV_RGB2GRAY);
-   
-   
-   // Code for experimenting differenty parameters for Canny
-   //   for (int c=10;c<=100;c=c+10){
-   //      char buf[50];
-   //      Mat test;
-   //      sprintf(buf,"Canny%d",c);
-   //      Canny(gray,test,0.66*c,1.33*c,3,true);  
-   //      VLOG(buf, test);       
-   //   }
-
-   Mat canny;
-   int s = 200;
-   Canny(gray,canny,0.66*s,1.33*s,3,true);  
-   VLOG("Canny", canny); 
-   
-   Mat edges;
-   Mat v = Mat::ones(2,2,CV_8UC1);
-   
-   dilate(canny, edges, v);
-   erode(edges, edges, v);   
-   
-   dilate(edges, edges, Mat::ones(3,3,CV_8UC1));
-   VLOG("Dilated", edges); 
-   
-   double k = 0.85;
-   double tol = 0.10;
-   Mat q = Mat::ones(5,5,CV_8UC1);
-   
-   Mat h1,h2,hvotes;
-   voteCenter_Horizontal(edges, h1, bw*k, bw*tol, bh/2);
-   dilate(h1, h1, q);
-   voteCenter_Horizontal(edges, h2, bw*k, bw*tol, -bh/2);
-   dilate(h2, h2, q);
-   
-   bitwise_and(h1,h2,hvotes);
-   VLOG("H-votes", hvotes); 
-   
-   
-   Mat v1,v2,vvotes;
-   voteCenter_Vertical(edges, v1, bh*k, bh*tol, bw/2);
-   dilate(v1, v1, q);
-   
-   voteCenter_Vertical(edges, v2, bh*k, bh*tol, -bw/2);
-   dilate(v2, v2, q);
-   
-   bitwise_and(v1,v2,vvotes);
-   VLOG("V-votes", vvotes); 
-   
-   Mat hvvotes;
-   bitwise_and(vvotes,hvotes,hvvotes);
-   VLOG("HV-votes", hvvotes); 
-   
-   
-
-   
-   Mat copy = hvvotes.clone();
-   
-   
-   vector<vector<Point> > contours;
-   vector<Vec4i> hierarchy;
-   
-   findContours( copy, contours, hierarchy,
-                CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE );
-   
-   vector<Blob> blobs;
-   
-   Mat blank = dark.clone();
-   blank = 0.0;
-   
-   Mat contour_shading = blank;
-
-   
-   // define a perfect box for back-proj verification
-   Mat pbox = Mat::zeros(bh,bw,CV_8UC1); 
-   pbox.row(0).setTo(255);
-   pbox.row(bh-1).setTo(255);
-   pbox.col(0).setTo(255);
-   pbox.col(bw-1).setTo(255);
-   int pscore = countNonZero(pbox);
-   
-   for (vector<vector<Point> >::iterator it = contours.begin();
-        it != contours.end(); ++it){
-      
-      vector<Point>& contour = *it;
-      
-      Rect r = boundingRect(Mat(contour));
-      
-      double a1 = contourArea(Mat(contour));
-      double a2 = r.height * r.width;
-      
-      int cx = r.x + r.width/2;
-      int cy = r.y + r.height/2;
-      
-      
-      Rect box(cx-bw/2,cy-bh/2,bw,bh);
-      
-      Mat e(edges, box);
-      // calculate the score by comparing each hypothesized box to the ideal box
-      Mat sc;
-      bitwise_and(e,pbox,sc);
-      int score = countNonZero(sc);
-      
-      // ignore those boxes with fewer than this percentage 
-      // of edge pixels
-      if ((1.0 * score) / (1.0 * pscore) < 0.90)
-         continue;
-      
-     // rectangle(contour_shading, Point(box.x,box.y), Point(box.x+box.width,box.y+box.height), Color::RANDOM(), CV_FILLED);
-      
-
-      Blob blob(box);
-      blob.score = score;
-      blobs.push_back(blob);
-      
-   }
-   
-   
-   Mat blobs_image = dark.clone();
-   
-   Painter::drawBlobsRandomShading(blobs_image, blobs);
-   VLOG("BlobHypotheses", blobs_image); 
-   
-   
-   // remove overlapping blobs
-   // and do non-maximal suppression
-   vector<Blob> nonoverlapping_blobs;
-   
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& b = *it;
-      
-      bool not_overlap = true;
-      int tolerance = 3;
-      vector<Blob>::iterator ito;
-      for (ito = nonoverlapping_blobs.begin();
-           ito != nonoverlapping_blobs.end(); ++ito){
-         
-         Blob& bo = *ito;
-         
-         not_overlap = b.x >= bo.x + bo.width - tolerance || b.y >= bo.y + bo.height - tolerance||
-            b.x + b.width <= bo.x + tolerance|| b.y + b.height <= bo.y + tolerance;
-         
-         if (!not_overlap)
-            break;
-         
-      }
-      
-      if (not_overlap){
-         
-         nonoverlapping_blobs.push_back(b);
-         
-      }else{
-         // replace it if the score is better
-      
-         if (it->score > ito->score){
-          
-            (*ito) = (*it);
-         }
-         
-      }
-      
-   }
-   
-   
-   vector<Blob>& result_blobs = nonoverlapping_blobs;
-   
-   
-   Mat result_blobs_image = dark.clone();
-   Painter::drawBlobsRandomShading(result_blobs_image, result_blobs);
-   VLOG("OutputBlobs", result_blobs_image);
-   
-   // print output to stdout
-   for (vector<Blob>::iterator it = result_blobs.begin();
-        it != result_blobs.end(); ++it){
-      Blob& b = *it;
-      dout() << b.x << " " << b.y << " " << b.width << " " << b.height << " " << b.score << endl;
-   }
-   
-   
-   return result_blobs_image;
-}
-
-Mat
-cvgui::findPokerBoxes(const Mat& screen, vector<Blob>& output_blobs){
-   
-   
-   //return findBoxesByVoting(screen, 70, 90, output_blobs);
-   return findBoxesByVoting(screen, 40, 50, output_blobs);
-   
-   
-// old algorithm
-#if 0   
-   Mat dark;
-   Util::rgb2grayC3(screen,dark);
-   dark = dark * 0.5;
-   
-   
-   VLOG("Input", screen);
-   
-   Mat gray;
-   cvtColor(screen,gray,CV_RGB2GRAY);
-   
-   //medianBlur(gray, gray, 3);
-   //VLOG("Blurred", gray); 
-   
-   Mat edges;
-   
-   // Code for experimenting differenty parameters for Canny
-   //   for (int c=10;c<=100;c=c+10){
-   //      char buf[50];
-   //      Mat test;
-   //      sprintf(buf,"Canny%d",c);
-   //      Canny(gray,test,0.66*c,1.33*c,3,true);  
-   //      VLOG(buf, test);       
-   //   }
-   
-   int s = 100;
-   Canny(gray,edges,0.66*s,1.33*s,3,true);  
-   VLOG("Canny", edges); 
-   
-   
-   Mat v = Mat::ones(2,2,CV_8UC1);
-
-   dilate(edges, edges, v);
-   erode(edges, edges, v);
-
-   VLOG("Dilated", edges); 
-   
-   // experimental
-   Mat hlines,vlines;
-   dilate(edges, edges, Mat::ones(3,2,CV_8UC1));
-   
-   
-   findLongLines_Vertical(edges,vlines, 50, 2);
-   VLOG("V-lines", vlines); 
-   
-   findLongLines_Horizontal(edges,hlines, 50, 2);
-   VLOG("H-lines", hlines);
-
-   
-   int bw = 70;
-   int bh = 20;
-   double k = 0.90;
-   
-   Mat q = Mat::ones(5,5,CV_8UC1);
-   
-   Mat h1,h2,hvotes;
-   voteCenter_Horizontal(edges, h1, bw*k, 2, bh/2);
-   dilate(h1, h1, q);
-   voteCenter_Horizontal(edges, h2, bw*k, 2, -bh/2);
-   dilate(h2, h2, q);
-
-   bitwise_and(h1,h2,hvotes);
-   VLOG("H-votes", hvotes); 
-
-   
-   Mat v1,v2,vvotes;
-   voteCenter_Vertical(edges, v1, bh*k, 2, bw/2);
-   dilate(v1, v1, q);
-
-   voteCenter_Vertical(edges, v2, bh*k, 2, -bw/2);
-   dilate(v2, v2, q);
-
-   bitwise_and(v1,v2,vvotes);
-   VLOG("V-votes", vvotes); 
-
-   Mat hvvotes;
-   bitwise_and(vvotes,hvotes,hvvotes);
-   VLOG("HV-votes", hvvotes); 
-   
-   
-//   Mat hvlines;
-//   bitwise_or(hlines, vlines, hvlines);
-//   VLOG("HV-lines", hvlines);
-   
-   // 
-
-   Mat lines;
-   findLongLines(edges, lines, 15);
-   
-   Mat w = Mat::ones(5,5,CV_8UC1);
-   dilate(lines, lines, w);
-   erode(lines, lines, w);
-   
-   VLOG("Lines", lines); 
-
-   
-   Mat lines2;
-   Mat z = Mat::ones(2,2,CV_8UC1);   
-
-   dilate(lines, lines, z);
-   
-   findLongLines(lines, lines2, 30, 15);
-
-   //dilate(lines2, lines2, z);
-   //erode(lines2, lines2, z);
-   
-   VLOG("Lines2", lines2); 
-
-
-   
-   Mat result = dark.clone();
-   //Mat copy = edges.clone();
-   //Mat copy = lines.clone();
-   
-   Mat copy = lines2.clone();
-   
-   
-   vector<vector<Point> > contours;
-   vector<Vec4i> hierarchy;
-   
-   findContours( copy, contours, hierarchy,
-                CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE );
-  
-   vector<Blob> blobs;
-   
-   Mat blank = dark.clone();
-   blank = 0.0;
-   
-   Mat contour_shading = blank;//dark.clone();
-   
-   for (vector<vector<Point> >::iterator it = contours.begin();
-        it != contours.end(); ++it){
-      
-      vector<Point>& contour = *it;
-      
-      Rect r = boundingRect(Mat(contour));
-      
-      double a1 = contourArea(Mat(contour));
-      double a2 = r.height * r.width;
-      
-      
-      if (a2 < 100)
-         continue;
-         
-      
-      if (abs(r.width - 65) > 5)
-         continue;
-      
-      //if ( min(a1,a2)/max(a1,a2) > 0.80){
-         
-         vector<vector<Point> > cs;
-         cs.push_back(contour);
-         drawContours(contour_shading, cs, -1, Color::RANDOM(), CV_FILLED);
-         
-         
-         Blob blob(r);
-         blobs.push_back(blob);
-      //}
-      
-   }
-   
-   Mat contours_image = contour_shading*0.7 + dark*0.5;
-
-   Painter::drawBlobs(contours_image, blobs, Color::WHITE);
-
-   VLOG("ColoredSelectedContours", contours_image); 
-   
-   
-
-   
-   vector<Blob> nonoverlapping_blobs;
-
-   // print output to stdout
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& b = *it;
-      bool not_overlap = true;
-      for (vector<Blob>::iterator ito = nonoverlapping_blobs.begin();
-           ito != nonoverlapping_blobs.end(); ++ito){
-            
-         Blob& bo = *ito;
-         
-         not_overlap = b.x >= bo.x + bo.width || b.y >= bo.y + bo.height ||
-         b.x + b.width <= bo.x || b.y + b.height <= bo.y;
-            
-         if (!not_overlap)
-            break;
-         
-      }
-      
-      if (not_overlap){
-         nonoverlapping_blobs.push_back(b);
-      }
-      
-   }
-   
-   
-   vector<Blob>& result_blobs = nonoverlapping_blobs
-   
-   
-   Mat blobs_result = dark.clone();
-   Painter::drawBlobs(blobs_result, result_blobs, Color::RED);
-   
-   VLOG("OutputBlobs", blobs_result);
-   
-   // print output to stdout
-   for (vector<Blob>::iterator it = result_blobs.begin();
-        it != result_blobs.end(); ++it){
-   
-      dout() << b.x << " " << b.y << " " << b.width << " " << b.height << endl;
-   }
-
-      
-   return contours_image;
-#endif     
-}
-
-void
-cvgui::findBoxes(const Mat& screen, vector<Blob>& output_blobs){
-
-   Mat dark;
-   Util::rgb2grayC3(screen,dark);
-   dark = dark * 0.5;
-   
-   
-   VLOG("Input", screen);
-   
-   Mat gray;
-   cvtColor(screen,gray,CV_RGB2GRAY);
-   
-   //medianBlur(gray, gray, 3);
-   //VLOG("Blurred", gray); 
-   
-   Mat edges;
-
-// Code for experimenting differenty parameters for Canny
-//   for (int c=10;c<=100;c=c+10){
-//      char buf[50];
-//      Mat test;
-//      sprintf(buf,"Canny%d",c);
-//      Canny(gray,test,0.66*c,1.33*c,3,true);  
-//      VLOG(buf, test);       
-//   }
-
-   int s = 100;
-   Canny(gray,edges,0.66*s,1.33*s,3,true);  
-   VLOG("Canny", edges); 
-
-
-   dilate(edges, edges, Mat::ones(2,2,CV_8UC1));
-   VLOG("Dilated", edges); 
-
-
-   
-   
-   Mat result = dark.clone();
-   Mat copy = edges.clone();
-   
-   
-   vector<vector<Point> > contours;
-   vector<Vec4i> hierarchy;
-   
-   findContours( copy, contours, hierarchy,
-                CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE );
-
-//   findContours(edges, contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
-
-   //findContours( copy, contours, hierarchy,
-    //            CV_RETR_CCOMP, CV_CHAIN_APPROX_SIMPLE );
-   
-//   cout << contours.size() << " " << hierarchy.size() << endl;
-   // iterate through all the top-level contours,
-   // draw each connected component with its own random color
-//   int idx = 0;
-//   for( ; idx >= 0; idx = hierarchy[idx][0]){
-//      
-//      vector<Point>& contour = contours[idx];
-//      
-//      
-//      //Scalar color( rand()&255, rand()&255, rand()&255 );
-//      Scalar cyan(255,255,0);
-//      vector<vector<Point> > cs;
-//      cs.push_back(contour);
-//      drawContours( result, cs, -1, cyan, 2);//, CV_FILLED);
-//      
-// //     drawContours( result, contours, idx, color, CV_FILLED, 8, hierarchy );
-//
-//   }
-   
-   vector<Blob> blobs;
-   
-   
-   Mat box_contour_image = dark.clone();
-   
-   for (vector<vector<Point> >::iterator it = contours.begin();
-        it != contours.end(); ++it){
-      
-      vector<Point>& contour = *it;
-    
-      Rect r = boundingRect(Mat(contour));
-      
-      double a1 = contourArea(Mat(contour));
-      double a2 = r.height * r.width;
-      
-      
-      
-      
-      if ( min(a1,a2)/max(a1,a2) > 0.80){
-
-         vector<vector<Point> > cs;
-         cs.push_back(contour);
-         drawContours(box_contour_image, cs, -1, Color::RANDOM(), 2);//, CV_FILLED);
-         
-         
-         Blob blob(r);
-         blobs.push_back(blob);
-      }
-      
-   }
-   
-        
-   VLOG("Box-shaped contours", box_contour_image); 
-   
-   
-   Mat blobs_result = dark.clone();
-   Painter::drawBlobs(blobs_result, blobs, Color::RED);
-   
-   VLOG("Blobs", blobs_result);
-   
-   
-   vector<Blob> unique_blobs;
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& a = *it;
-
-      
-      vector<Blob>::iterator it1;
-      for (it1 = unique_blobs.begin(); 
-           it1 != unique_blobs.end(); ++it1){
-         
-         Blob& b = *it1;
-         
-         int d = 5;
-         bool similar_bounding_box = 
-            abs(a.x-b.x) < d && abs(a.y-b.y) < d &&
-         abs(a.height-b.height) < 2*d &&
-         abs(a.width-b.width) < 2*d;
-         
-         
-         if (similar_bounding_box)
-            break;
-            
-      }
-      
-      // if no blob whose bounding box is similar
-      if (it1 == unique_blobs.end()){
-       
-         // add this blob to the list of unique blobs
-         unique_blobs.push_back(a);
-      }
-   }
-   
-   Mat unique_blobs_result = dark.clone();
-   Painter::drawBlobs(unique_blobs_result, unique_blobs, Color::RED);
-   
-   VLOG("UniqueBlobs", unique_blobs_result);
-   
-   
-   vector<Blob> leaf_blobs;
-   getLeafBlobs(unique_blobs, leaf_blobs);
-   
-      
-   Mat leaf_blobs_result = dark.clone();
-   Painter::drawBlobs(leaf_blobs_result, leaf_blobs, Color::RED);
-   VLOG("LeafBlobs", leaf_blobs_result);
-   
-   output_blobs = leaf_blobs;
-}
-
-
-
-
-void
-cvgui::computeUnitBlobs(const Mat& screen, Mat& output){
-   
-   VLOG("Input", screen);
-   
-   Mat gray;
-   cvtColor(screen,gray,CV_RGB2GRAY);
-   
-   
-   Mat edges;
-   Canny(gray,edges,0.66*50,1.33*50,3,true);  
-   VLOG("Canny", edges); 
-   
-//   Mat corners;
-//   cornerHarris(gray,corners,10,5,1.0);
-
-//   Mat corners_result = screen.clone();
-//   vector<Point2f> corners;
-//   goodFeaturesToTrack(gray, corners, 50, 0.5, 10);
-//   for (vector<Point2f>::iterator it = corners.begin(); it != corners.end(); ++it){
-//      Point2f& p = *it;
-//      circle(corners_result, p, 3, Scalar(0,0,255));
-//   }
-//   VLOG("Corners", corners_result); 
-   
-   
-   adaptiveThreshold(gray, gray, 255, ADAPTIVE_THRESH_MEAN_C, THRESH_BINARY_INV, 5, 1);
-   VLOG("AdaptiveThresholded", gray);
-   
-   Mat lines;
-   cvgui::findLongLines(gray, lines);
-   
-   Mat lines_viz = lines.clone();
-   dilate(lines_viz, lines_viz, Mat::ones(4,4,CV_8UC1));
-   VLOG("LongLinesFound", lines_viz);
-   
-   Mat not_lines;
-   bitwise_not(lines, not_lines);
-   
-   Mat foreground;
-   bitwise_and(gray, not_lines, foreground);
-   
-   gray.setTo(0, lines);
-   VLOG("LongLinesRemoved",gray);
-   
-   
-   dilate(edges, edges, Mat::ones(3,3,CV_8UC1));
-   bitwise_and(gray, edges, gray);
-   
-   VLOG("NonEdgeRemoved", gray);
-   
-   //GaussianBlur(gray, gray, Size(3, 3), 3);
-   //VLOG("Blurred", gray); 
-
-   output = gray;
-}
-
-
-
-void 
-cvgui::getParagraphBlobs(const Mat& screen, vector<ParagraphBlob>& output_parablobs){
-      
-   VisualLogger::newImage();
-   Mat screen_gray;
-   cvtColor(screen,screen_gray,CV_RGB2GRAY);
-   
-   Mat blobs_mask;
-   cvgui::computeUnitBlobs(screen, blobs_mask);
-   
-   Mat dark;
-   Util::rgb2grayC3(screen,dark);
-   dark = dark * 0.5;
-   
-   vector<Blob> blobs;
-   cvgui::extractBlobs(blobs_mask, blobs);
-   
-   cvgui::calculateColor(blobs, screen, blobs_mask);
-   
-   // draw blobs
-   Mat result_blobs = dark.clone();
-   Painter::drawBlobs(result_blobs, blobs, Scalar(255,255,0));   
-   VLOG("blobs-extracted",result_blobs);
-   
-   
-   vector<Blob> filtered_blobs;
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      
-      //  if (blob.height < 3 && blob.width < 3)
-      //         continue;
-      //      
-      //      if (blob.height < 4)
-      //         continue;
-      
-      filtered_blobs.push_back(blob);
-   }
-   
-   Mat result_filtered_blobs = dark.clone();
-   Painter::drawBlobs(result_filtered_blobs, filtered_blobs, Scalar(255,255,0));
-   
-   VLOG("blobs-filtered",result_filtered_blobs);
-   
-   
-   Mat result_lineblobs = dark.clone();
-   
-   vector<LineBlob> lineblobs;
-   cvgui::linkBlobsIntoLineBlobs(filtered_blobs, lineblobs, 20);
-   
-   Painter::drawLineBlobs(result_lineblobs, lineblobs, Scalar(255,255,0));
-   VLOG("lineblobs", result_lineblobs);
-   
-   
-   Mat result_lineblobs_filtered = dark.clone();
-   vector<LineBlob> filtered_lineblobs;
-   
-   // Calculate the bounding rectangle of each line of linked blobs
-   for (vector<LineBlob>::iterator it_lines = lineblobs.begin();
-        it_lines != lineblobs.end(); ++ it_lines){
-      
-      LineBlob& line = *it_lines;
-      
-      // Ignore lines with fewer than X elements
-      if (line.blobs.size()<2)
-         continue;
-
-      
-      if (line.height < 3)
-         continue;
-      
-      filtered_lineblobs.push_back(line);
-   }
-   
-   
-   
-   Painter::drawLineBlobs(result_lineblobs_filtered, filtered_lineblobs, Scalar(255,255,0));   
-   VLOG("lineblobs-filtered", result_lineblobs_filtered);
-   
-   
-   Mat result_merged_blobs = dark.clone();
-   
-   vector<LineBlob> merged_lineblobs;
-   cvgui::mergeLineBlobs(filtered_lineblobs, merged_lineblobs);
-   Painter::drawLineBlobs(result_merged_blobs, merged_lineblobs, Scalar(255,255,0));
-   VLOG("lineblobs-merged", result_merged_blobs);
-
-
-   vector<ParagraphBlob> parablobs;
-   cvgui::linkLineBlobsIntoPagagraphBlobs(merged_lineblobs, parablobs);
-   
-   Mat result_linked_parablobs = dark.clone();
-   
-   Painter::drawParagraphBlobs(result_linked_parablobs, parablobs, Scalar(255,0,0));
-   
-   VLOG("paragblobs", result_linked_parablobs);
-   
-   
-   output_parablobs = parablobs;
-   
-   
-//  Mat screen_dark = screen * 0.2;
-//   Mat ocr_result_image = screen_dark;
-//   
-//   
-//   for (vector<ParagraphBlob>::iterator it = parablobs.begin(); 
-//        it != parablobs.end(); ++it){
-//      
-//      
-//      ParagraphBlob& parablob = *it;      
-//      
-//      vector<OCRLine> ocrlines;
-//      
-//      cvgui::run_ocr_on_lineblobs(parablob.lineblobs, screen_gray, ocrlines);
-//      
-//      Painter::drawOCRLines(ocr_result_image, ocrlines);
-//      
-//   }
-//   
-//   VLOG("OCR-Result", ocr_result_image);
-   
-   
-}
-
-
-void
-cvgui::getLineBlobsAsIndividualWords(const Mat& screen, vector<LineBlob>& output_lineblobs){
-
-   Mat screen_gray;
-   cvtColor(screen,screen_gray,CV_RGB2GRAY);
-   
-   Mat blobs_mask;
-   cvgui::computeUnitBlobs(screen, blobs_mask);
-   
-   Mat dark;
-   Util::rgb2grayC3(screen,dark);
-   dark = dark * 0.5;
-   
-   vector<Blob> blobs;
-   cvgui::extractBlobs(blobs_mask, blobs);
-   
-   cvgui::calculateColor(blobs, screen, blobs_mask);
-   
-   // draw blobs
-   Mat result_blobs = dark.clone();
-   Painter::drawBlobs(result_blobs, blobs, Scalar(255,255,0));   
-   VLOG("blobs-extracted",result_blobs);
-   
-   
-   vector<Blob> filtered_blobs;
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      
-      //  if (blob.height < 3 && blob.width < 3)
-      //         continue;
-      //      
-      //      if (blob.height < 4)
-      //         continue;
-      
-      filtered_blobs.push_back(blob);
-   }
-   
-   Mat result_filtered_blobs = dark.clone();
-   Painter::drawBlobs(result_filtered_blobs, filtered_blobs, Scalar(255,255,0));
-   
-   VLOG("blobs-filtered",result_filtered_blobs);
-   
-   
-   Mat result_lineblobs = dark.clone();
-   
-   vector<LineBlob> lineblobs;
-   cvgui::linkBlobsIntoLineBlobs(filtered_blobs, lineblobs, 3);
-   
-   Painter::drawLineBlobs(result_lineblobs, lineblobs, Scalar(255,255,0));
-   VLOG("lineblobs", result_lineblobs);
-   
-   
-   Mat result_lineblobs_filtered = dark.clone();
-   vector<LineBlob> filtered_lineblobs;
-   
-   // Calculate the bounding rectangle of each line of linked blobs
-   for (vector<LineBlob>::iterator it_lines = lineblobs.begin();
-        it_lines != lineblobs.end(); ++ it_lines){
-      
-      LineBlob& line = *it_lines;
-      
-      // Ignore lines with fewer than X elements
-//      if (line.blobs.size()<2)
-//         continue;
-      
-      if (line.height < 3)
-         continue;
-      
-      filtered_lineblobs.push_back(line);
-   }
-   
-   
-   
-   Painter::drawLineBlobs(result_lineblobs_filtered, filtered_lineblobs, Scalar(255,255,0));   
-   VLOG("lineblobs-filtered", result_lineblobs_filtered);
-   
-   
-   
-   output_lineblobs = filtered_lineblobs;
-   
-  // Mat result_merged_blobs = dark.clone();
-//   
-//   vector<LineBlob> merged_lineblobs;
-//   cvgui::mergeLineBlobs(filtered_lineblobs, merged_lineblobs);
-//   Painter::drawLineBlobs(result_merged_blobs, merged_lineblobs, Scalar(255,255,0));
-//   VLOG("lineblobs-merged", result_merged_blobs);
-//   
-//   
-//   vector<ParagraphBlob> parablobs;
-//   cvgui::linkLineBlobsIntoPagagraphBlobs(merged_lineblobs, parablobs);
-//   
-//   Mat result_linked_parablobs = dark.clone();
-//   
-//   Painter::drawParagraphBlobs(result_linked_parablobs, parablobs, Scalar(255,0,0));
-//   
-//   VLOG("paragraph-linked", result_linked_parablobs);
-//   
-//   
-//   Mat screen_dark = screen * 0.2;
-//   Mat ocr_result_image = screen_dark;
-//   
-//   
-//   for (vector<ParagraphBlob>::iterator it = parablobs.begin(); 
-//        it != parablobs.end(); ++it){
-//      
-//      
-//      ParagraphBlob& parablob = *it;      
-//      
-//      vector<OCRLine> ocrlines;
-//      
-//      cvgui::run_ocr_on_lineblobs(parablob.lineblobs, screen_gray, ocrlines);
-//      
-//      Painter::drawOCRLines(ocr_result_image, ocrlines);
-//      
-//   }
-//   
-//   VLOG("OCR-Result", ocr_result_image);
-}
-
-void 
-cvgui::segmentScreenshot(const Mat& screen, vector<Blob>& text_blobs, vector<Blob>& image_blobs){
-   
-   VLOG("Input", screen);
-   
-   Mat gray, screen_gray;
-   if(screen.channels() > 1){
-      cvtColor(screen,gray,CV_RGB2GRAY);
-   }
-   else
-      gray = screen;
-
-   screen_gray = gray.clone();
-   
-   adaptiveThreshold(gray, gray, 255, ADAPTIVE_THRESH_MEAN_C, THRESH_BINARY_INV, 5, 1);
-   VLOG("AdaptiveThresholded", gray);
-   
-   
-   Mat lines;
-   cvgui::findLongLines(gray, lines);
-   
-   Mat lines_viz = lines.clone();
-   dilate(lines_viz, lines_viz, Mat::ones(4,4,CV_8UC1));
-   VLOG("LongLinesFound", lines_viz);
-   
-   Mat not_lines;
-   bitwise_not(lines, not_lines);
-   
-   Mat foreground;
-   bitwise_and(gray, not_lines, foreground);
-   
-   gray.setTo(0, lines);
-   VLOG("LongLinesRemoved",gray);
-   
-   
-   denoise(gray);   
-   VLOG("NoiseRemoved", gray);  
-   
-   dilate(gray,gray,Mat::ones(1,3,CV_8UC1));
-   VLOG("Dilated",gray);
-   
-   vector<Rect> rects;
-   //cvgui::extractRects(gray, rects);
-   
-   vector<Blob> blobs;
-   cvgui::extractBlobs(gray, blobs);
-   
-   
-   Mat dilated = gray.clone();
-   
-   
-   // visualization
-   Mat result;
-   Mat g;
-   cvtColor(screen, g, CV_RGB2GRAY);
-   
-   Mat ss[3] = {g,g,g};
-   merge(ss,3,result);   
-   result = result * 0.5;
-   
-   Mat bg = result.clone();
-   Mat screen_darken = bg.clone();
-   
-   
-   text_blobs.clear();
-   
-   for (vector<Blob>::iterator b = blobs.begin(); b != blobs.end(); ++b){
-      
-      Blob& blob = *b;
-      Rect& bound = blob;
-      Mat part(screen, bound);
-      //paste(part, result, r->x, r->y);
-      
-      Mat p = part.clone();
-      Mat g;
-      cvtColor(p, g, CV_RGB2GRAY);
-      adaptiveThreshold(g, g, 255, 
-                        ADAPTIVE_THRESH_MEAN_C, 
-                        THRESH_BINARY_INV, 3, 1);
-      vector<Rect> rs;
-      cvgui::extractSmallRects(g, rs);
-      for (vector<Rect>::iterator r = rs.begin();r != rs.end(); ++r){
-         r->x += bound.x;
-         r->y += bound.y;
-      }
-      
-      vector<Rect> rs0;
-      for (vector<Rect>::iterator q = rs.begin();
-           q != rs.end(); ++q){
-         
-         // exclude overly short element (e.g., dot of i)
-         if (q->height < 5)
-            continue;         
-         
-         rs0.push_back(*q);
-      }
-      
-      rs = rs0;
-      
-      // re-calculate the bounds
-      int x1,y1,x2,y2;
-      x1 = bound.x + bound.width;
-      y1 = bound.y + bound.height;
-      x2 = bound.x;
-      y2 = bound.y;
-      
-      for (vector<Rect>::iterator r = rs.begin();
-           r != rs.end(); ++r){
-         x1 = min(x1, r->x);
-         y1 = min(y1, r->y);
-         x2 = max(x2, r->x + r->width);
-         y2 = max(y2, r->y + r->height);
-      }
-      
-      //blob.bound = Rect(x1-2,y1-2,x2-x1+4,y2-y1+4);     
-      //blob.bound = Rect(x1,y1,x2-x1,y2-y1); 
-      
-      // make the bound bigger to be consistent with the dilated blobs
-      blob = Blob(Rect(x1-2,y1-1,x2-x1+4,y2-y1+2)); 
-      
-      
-      int MINIMUM_NUM_CHARBLOBS = 2;
-      
-      if (cvgui::areHorizontallyAligned(rs) && rs.size()>=MINIMUM_NUM_CHARBLOBS)
-         Painter::drawRects(result, rs, Scalar(0,255,0));
-      else
-         Painter::drawRects(result, rs, Scalar(0,0,255));
-      
-      if (cvgui::areHorizontallyAligned(rs) && rs.size()>=MINIMUM_NUM_CHARBLOBS){
-         text_blobs.push_back(blob);
-      }
-      
-   }
-   
-   //drawRects(result, rects, Scalar(255,0,0));
-   Painter::drawBlobs(result, blobs, Scalar(255,0,0));
-   
-   VLOG("TextBlocksExtracted",result);
-   
-   
-   
-   Mat text_mask = Mat::zeros(screen.size(), CV_8UC1);
-   
-   
-   for (vector<Blob>::iterator b = text_blobs.begin();
-        b != text_blobs.end(); ++b){
-      
-      Rect& r = *b;
-      Mat m(text_mask, 
-            Range(r.y,r.y+r.height),
-            Range(r.x,r.x+r.width));
-      
-      m = 255;
-      
-   }
-   
-   VLOG("TextBinaryMaskComputed", text_mask);
-   
-   
-   
-   
-   gray.setTo(0, text_mask);
-   VLOG("AfterTextRemoved",gray);
-   
-   dilate(gray,gray,Mat());
-   VLOG("DilatedAgain",gray);
-   
-   Mat dilated_again = gray.clone();
-   
-   vector<Blob> temp;
-   //cvgui::extractRects(gray, temp);
-   cvgui::extractBlobs(gray, temp);
-   
-   // only keep image rects larger than n pixels
-   
-   const int MIN_IMAGE_RECT_AREA = 150;
-   
-   image_blobs.clear();
-   for (vector<Blob>::iterator b = temp.begin();
-        b != temp.end(); ++b){
-      
-      if (b->width * b->height < MIN_IMAGE_RECT_AREA)
-         continue;
-      
-      //      // blob is too big, something is wrong
-      //      if (b->bound.width > 0.8 * screen.width)
-      //         continue;
-      //      if (b->bound.height > 0.8 * screen.height)
-      //         continue;
-      
-      image_blobs.push_back(*b);
-      
-   }
-   
-   Mat image_result = bg.clone();
-   
-   Painter::drawBlobs(image_result, image_blobs, Scalar(0,0,255));
-   VLOG("ImageRecordsExtracted", image_result);
-
-   return;
-   
-   Mat ui_mask = Mat::zeros(screen.size(), CV_8UC1);
-   Mat photo_mask = Mat::zeros(screen.size(), CV_8UC1);
-   for (vector<Blob>::iterator b = image_blobs.begin();
-        b != image_blobs.end(); ++b){
-      
-      Rect& r = *b;
-      Mat mask;
-      if (r.height < 100)
-         mask = ui_mask;
-      else 
-         mask = photo_mask;
-      
-      Mat m(mask, 
-            Range(r.y,r.y+r.height),
-            Range(r.x,r.x+r.width));
-      
-      m = 255;
-   }
-   
-   VLOG("UIMask", ui_mask);
-   VLOG("PhotoMask", photo_mask);
-   
-   Mat segmap;
-   Mat segmapr;
-   Mat segmapg;
-   Mat segmapb;
-   
-   bitwise_and(dilated,text_mask,segmapr);
-   bitwise_and(dilated,ui_mask,segmapg);
-   bitwise_and(dilated_again,photo_mask,segmapb);
-   //segmapb = photo_mask;
-   
-   
-   Mat cs[3] = {segmapb, segmapg,segmapr};
-   merge(cs,3,segmap);   
-   VLOG("SegMap", segmap);
-   
-   
-   //Mat wordmap = screen_darken.clone();//segmap.clone();
-   Mat wordmap = Mat::zeros(screen.size(), CV_8UC3);
-   
-   
-   screen.copyTo(wordmap, segmapg);
-   screen.copyTo(wordmap, photo_mask);
-   screen.copyTo(wordmap, text_mask);
-   
-   
-   
-   Mat random_ids = Mat::ones(1,100,CV_8UC1);
-   randu(random_ids, 22, 80);
-   
-   Scalar white(255,255,255);
-   Scalar black(0,0,0);
-   Scalar yellow(255,255,0);
-   
-   
-   int i = 0;
-   
-   for (vector<Blob>::iterator b = image_blobs.begin();
-        b != image_blobs.end(); ++b){
-      
-      Rect& r = *b;
-      
-      
-      char vwstr[100];
-      
-      
-      if (r.height < 100){
-         
-         int xc = r.x + r.width/2;
-         int yc = r.y + r.height/2;
-         
-         
-         //         putTextWithBackgroundCentered(black, wordmap, "u12", Point(xc,yc), 
-         //                               FONT_HERSHEY_SIMPLEX, 0.5, white);
-         
-         int id = random_ids.at<uchar>(0,i++);
-         sprintf(vwstr,"u%d",id);   
-         
-//         putTextWithBackgroundCentered(white, wordmap, vwstr, Point(xc,yc), 
-//                                       FONT_HERSHEY_DUPLEX, 0.5, black);
-         
-         
-      }else{ 
-         
-         
-         SURF surf_extractor(6.0e3);
-         vector<KeyPoint> keypoints;
-         
-         // printf("Extracting keypoints\n");
-         surf_extractor(screen_gray, photo_mask, keypoints);
-         //printf("Extracted %d keypoints from the image\n", (int)keypoints.size());
-         
-         for (vector<KeyPoint>::iterator it = keypoints.begin(); it != keypoints.end(); ++it){
-            KeyPoint& p = *it;
-            
-            circle(wordmap, p.pt, p.size*1.5, yellow);
-            
-            //            putTextWithBackgroundCentered(black, wordmap, "v12", p.pt,  
-            //                                  FONT_HERSHEY_SIMPLEX, 0.5, white);
-            
-            int id = random_ids.at<uchar>(0,i++);
-            sprintf(vwstr,"s%d",id);
-            
-//            putTextWithBackgroundCentered(white, wordmap, vwstr, p.pt,  
-//                                          FONT_HERSHEY_DUPLEX, 0.5, black);
-            
-         }
-      }
-      
-      
-   }
-   
-   VLOG("WordMap", wordmap);
-}
-
-
-
-
-static int L1dist(Vec3b p1, Vec3b p2){
-	return max(p1[0],p2[0])-min(p1[0],p2[0])+	
-   max(p1[1],p2[1])-min(p1[1],p2[1])+
-   max(p1[2],p2[2])-min(p1[2],p2[2]);	
-}
-
-
-
-bool 
-cvgui::areHorizontallyAligned(const vector<Rect>& rects){
-   
-   if (rects.size() <= 1)
-      return true;
-   
-   vector<Rect> sorted_rects = rects;
-   sort(sorted_rects, sort_by_x);
-   
-   int ymin = 10000;
-   int ymax = 0;
-   
-   bool no_overlap = true;
-   for (vector<Rect>::const_iterator r = sorted_rects.begin() + 1;
-        r != sorted_rects.end(); ++r){
-      
-      no_overlap = no_overlap && (r->x >= (r-1)->x + (r-1)->width - 2);
-      
-      int baseline = r->y + r->height;
-      ymin = min(baseline, ymin);
-      ymax = max(baseline, ymax);
-   }
-   
-   bool baseline_aligned = (ymax - ymin < 10);
-   
-   int minv = 10000;
-   int maxv = 0;   
-   for (vector<Rect>::const_iterator r = sorted_rects.begin();
-        r != sorted_rects.end(); ++r){
-      
-      int v = r->height;
-      minv = min(v, minv);
-      maxv = max(v, maxv);
-   }
-   
-   bool height_similar = (maxv - minv < 10);
-   
-   // if the difference between the highest and lowest baseline
-   // is too large, it means the rects are not alginged horizontally
-   
-   return baseline_aligned && height_similar && no_overlap;
-}
-
-
-bool
-cvgui::hasMoreThanNUniqueColors(const Mat& src, int n){
-   
-   
-   Mat_<Vec3b>::const_iterator it = src.begin<Vec3b>(),
-   itEnd = src.end<Vec3b>();
-   
-   
-   vector< pair<Vec3b,int> > colors; 
-   //vector<int> counts;
-   colors.push_back( pair<Vec3b,int>(*it,1) );
-   ++it;
-   
-   for(; it != itEnd; ++it){
-      
-      bool matched;
-      matched = false;
-      for (vector< pair<Vec3b,int> >::iterator c = colors.begin();
-           c != colors.end();
-           ++c){
-         
-         Vec3b& color = (*c).first;
-         int& count = (*c).second;
-         
-         int d = L1dist((*it), (color));
-         //cout << d << endl;
-         if (d < 150){
-            matched = true;
-            count++;
-            break;
-         }
-      }
-      
-      if (!matched){
-         
-         //    if (colors.size() == 4)
-         //     return true;
-         // else
-         colors.push_back(pair<Vec3b,int>(*it,1));
-         
-      }
-      
-   }
-   
-   dout() << endl << endl;
-   for (vector< pair<Vec3b,int> >::iterator c = colors.begin();
-        c != colors.end();
-        ++c){
-      
-      Vec3b& color = (*c).first;
-      int& count = (*c).second;
-      //cout << count << endl;
-   }
-   
-   return (colors.size() > 5);
-}
-
-
-void 
-cvgui::extractSmallRects(const Mat& src, 
-                         vector<Rect>& rects){
-   
-   Mat copy = src.clone();
-   
-   vector<vector<Point> > contours;
-   findContours(copy, contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
-   
-   for (vector<vector<Point> >::iterator contour = contours.begin();
-        contour != contours.end(); ++contour){
-      
-      Rect bound = boundingRect(Mat(*contour));
-      rects.push_back(bound);
-   }
-   
-}
-
-void
-cvgui::calculateColor(vector<Blob>& blobs, 
-                      const Mat& color_image,
-                      const Mat& foreground_mask){
-   
-   
-   for (vector<Blob>::iterator it = blobs.begin();
-        it != blobs.end(); ++it){
-      
-      Blob& blob = *it;
-      
-      
-      Mat part(color_image, blob);
-      Mat mask(foreground_mask, blob);
-      Scalar mean, stddev;
-      meanStdDev(part, mean, stddev, mask);
-      
-      blob.mr = mean[0];
-      blob.mg = mean[1];
-      blob.mb = mean[2];
-      
-   }
-   
-}
-
-
-void 
-cvgui::extractBlobs(const Mat& src, vector<Blob>& blobs){
-   
-   Mat copy = src.clone();
-   blobs.clear();
-   
-   vector<vector<Point> > contours;
-   findContours(copy, contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
-   
-   
-   for (vector<vector<Point> >::iterator contour = contours.begin();
-        contour != contours.end(); ++contour){
-      
-      
-      double area = contourArea(Mat(*contour));
-      
-      Rect bound = boundingRect(Mat(*contour));
-      
-      
-      
-      
-      Blob blob(bound);
-      blob.area = area;
-      blobs.push_back(blob);
-      
-   }
-   
-   
-   
-   
-   
-}
-
-
-void 
-cvgui::extractRects(const Mat& src, 
-                    vector<Rect>& rects){
-   
-   Mat copy = src.clone();
-   rects.clear();
-   
-   
-   vector<vector<Point> > contours;
-   findContours(copy, contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
-   
-   
-   for (vector<vector<Point> >::iterator contour = contours.begin();
-        contour != contours.end(); ++contour){
-      
-      
-      double area = contourArea(Mat(*contour));
-      
-      Rect bound = boundingRect(Mat(*contour));
-      
-      
-      // too small
-      if (bound.width < 6 || bound.height < 6)
-         continue;
-      
-      // too empty
-      if (bound.height > 100 && bound.width * bound.height * 0.50 > area)
-         continue;
-      
-      rects.push_back(bound);
-      
-   }
-   
-}
-
-void
-cvgui::findLongLines_Vertical(const Mat& src, Mat& dest, int min_length, int extension){
-   dest = src.clone();
-
-   Mat maskT, destT;
-   transpose(dest,destT);
-   cvgui::findLongLines_Horizontal(destT,maskT,min_length, extension);
-   
-   Mat maskTT;
-   transpose(maskT,maskTT);   
-   dest = maskTT;
-}
-
-
-void
-cvgui::findLongLines(const Mat& src, Mat& dest, int min_length, int extension){
-   
-   Mat copy = src.clone();
-   Mat v,h;
-  
-   cvgui::findLongLines_Horizontal(copy, h, min_length, extension);
-
-   
-   cvgui::findLongLines_Vertical(copy, v, min_length, extension);
-
-//   Mat maskT, destT;
-//   transpose(dest,destT);
-//   cvgui::findLongLines_Horizontal(destT,maskT,min_length, extension);
-//   
-//   Mat maskTT;
-//   transpose(maskT,maskTT);
-   
-   
-   bitwise_or(v,h,dest);
-   
-}
-
-
-//void
-//cvgui::filterLineSegments(const Mat& src, Mat& dest,
-//                          int min_length, int max_length){
-//   
-//   typedef uchar T;
-//   
-//   int extension = 5;
-//   
-//  	dest = Mat::zeros(src.rows,src.cols,CV_8UC1);
-//   
-//	Size size = src.size();
-//	for( int i = 0; i < size.height; i +=1 ){
-//      
-//		const T* ptr1 = src.ptr<T>(i);
-//		T* ptr2 = dest.ptr<T>(i);	
-//		
-//		bool has_previous_baseline = false;
-//		int previous_baseline_endpoint = 0;
-//		int current_baseline_startpoint = 0;
-//      
-//      
-//      for( int j = 1; j < size.width; j += 1 ){			
-//			
-//         
-//         if (ptr1[j] > 0 && ptr1[j-1] == 0){
-//            current_baseline_startpoint = j;
-//         }
-//         
-//         if (ptr1[j-1] > 0 &&  (ptr1[j] == 0 || j == size.width - 1)){
-//            
-//            
-//				// check for the condition of a baseline hypothesis
-//				// the length of the baseline must be > 15
-//				if ((j - current_baseline_startpoint) > min_length){// || j == size.width - 1){
-//					
-//               //					int closeness_threshold = 1; 					
-//               //					if (has_previous_baseline && 
-//               //                   (current_baseline_startpoint - previous_baseline_endpoint) 
-//               //						 <= closeness_threshold){
-//               //						
-//               //						
-//               //						// merge the current baseline with the previously baseline
-//               //						for (int k=previous_baseline_endpoint; 
-//               //                       k < current_baseline_startpoint; k += 1){
-//               //	                     ptr2[k] = ptr1[j];
-//               //						}
-//               //					}
-//					
-//               //	has_previous_baseline = true;
-//					//previous_baseline_endpoint = j;
-//					
-//               
-//					for (int k=current_baseline_startpoint; k < j; ++k){
-//                  ptr2[k] = 255;
-//					}	
-//               
-//               for (int k=j; k < min(j+extension,size.width-1); ++k){
-//                  ptr2[k] = 255;
-//					}	
-//               
-//					
-//				}
-//				
-//				// forming a new baseline hypothesis
-//				//current_baseline_startpoint = j+1;
-//			}
-//      }
-//   }	 
-//   
-//}
-
-
-void
-cvgui::voteCenter_Vertical(const Mat& binary, Mat& dest,
-                             int min_length, int tolerance, int distance){
-
-   dest = binary.clone();
-   
-   Mat maskT, destT;
-   transpose(dest,destT);
-   cvgui::voteCenter_Horizontal(destT,maskT,min_length,tolerance,distance);
-   
-   Mat maskTT;
-   transpose(maskT,maskTT);   
-   dest = maskTT;
-}
-
-void
-cvgui::voteCenter_Horizontal(const Mat& binary, Mat& dest,
-                             int min_length, int tolerance, int distance){
-   
-   typedef uchar T;
-   
-  	dest = Mat::zeros(binary.rows,binary.cols,CV_8UC1);
-   
-	Size size = binary.size();
-	for( int i = 0; i < size.height; i +=1 ){
-      
-		const T* ptr1 = binary.ptr<T>(i);
-		T* ptr2 = 0;
-      //dest.ptr<T>(i);
-//      
-//      
-//      T* ptru = 0;
-//      T* ptrb = 0;
-//      
-      int grid = 5;
-      
-      
-      int gi = grid*(i+distance)/grid;
-      
-      if (gi >= 0 && gi < size.height){
-         ptr2 = dest.ptr<T>(i+distance);
-      }
-      
-//      if (grid*(i+distance)/grid<size.height){
-//         ptrb = dest.ptr<T>(i+distance);
-//      }
-		
-		bool has_previous_baseline = false;
-		int previous_baseline_endpoint = 0;
-		int current_baseline_startpoint = 0;
-      
-      
-      for( int j = 1; j < size.width; j += 1 ){			
-			
-         
-         if (ptr1[j] > 0 && ptr1[j-1] == 0){
-            current_baseline_startpoint = j;
-         }
-         
-         if (ptr1[j-1] > 0 &&  (ptr1[j] == 0 || j == size.width - 1)){
-            
-            
-				// check for the condition of a baseline hypothesis
-				// the length of the baseline must be > 15
-				if ((j - current_baseline_startpoint) > min_length){// || j == size.width - 1){
-		
-					
-               
-					for (int k=current_baseline_startpoint+min_length/2; k < j-min_length/2; ++k){
-                  
-                  if (ptr2)
-                     ptr2[k] = 255;                  
-					}	
-
-               for (int k=j-min_length/2; k < min(j-min_length/2+tolerance,size.width-1); ++k){
-                 
-                  if (ptr2)
-                     ptr2[k] = 255;
-                  
-					}	
-               
-					
-				}
-				
-				// forming a new baseline hypothesis
-				//current_baseline_startpoint = j+1;
-			}
-      }
-   }	 
-   
-}  
-
-void
-cvgui::findLongLines_Horizontal(const Mat& binary, Mat& dest,
-                                int min_length, int extension){
-   
-   typedef uchar T;
-   
-  	dest = Mat::zeros(binary.rows,binary.cols,CV_8UC1);
-   
-	Size size = binary.size();
-	for( int i = 0; i < size.height; i +=1 ){
-      
-		const T* ptr1 = binary.ptr<T>(i);
-		T* ptr2 = dest.ptr<T>(i);	
-		
-		bool has_previous_baseline = false;
-		int previous_baseline_endpoint = 0;
-		int current_baseline_startpoint = 0;
-      
-      
-      
-      
-      for( int j = 1; j < size.width; j += 1 ){			
-			
-         
-         if (ptr1[j] > 0 && ptr1[j-1] == 0){
-            current_baseline_startpoint = j;
-         }
-         
-         if (ptr1[j-1] > 0 &&  (ptr1[j] == 0 || j == size.width - 1)){
-            
-            
-				// check for the condition of a baseline hypothesis
-				// the length of the baseline must be > 15
-				if ((j - current_baseline_startpoint) > min_length){// || j == size.width - 1){
-					
-               //					int closeness_threshold = 1; 					
-               //					if (has_previous_baseline && 
-               //                   (current_baseline_startpoint - previous_baseline_endpoint) 
-               //						 <= closeness_threshold){
-               //						
-               //						
-               //						// merge the current baseline with the previously baseline
-               //						for (int k=previous_baseline_endpoint; 
-               //                       k < current_baseline_startpoint; k += 1){
-               //	                     ptr2[k] = ptr1[j];
-               //						}
-               //					}
-					
-               //	has_previous_baseline = true;
-					//previous_baseline_endpoint = j;
-					
-               
-					for (int k=current_baseline_startpoint; k < j; ++k){
-                  ptr2[k] = 255;
-					}	
-
-               for (int k=j; k < min(j+extension,size.width-1); ++k){
-                  ptr2[k] = 255;
-					}	
-               
-					
-				}
-				
-				// forming a new baseline hypothesis
-				//current_baseline_startpoint = j+1;
-			}
-      }
-   }	 
-} 
-
-
-Mat
-cvgui::obtainGrayBackgroundMask(const Mat& input){
-   
-   Mat copy = input.clone();
-   
-   Mat_<Vec3b>::iterator it = copy.begin<Vec3b>(),
-   itEnd = copy.end<Vec3b>();
-   for(; it != itEnd; ++it){
-      
-      uchar& b = (*it)[0];
-      uchar& g = (*it)[1];
-      uchar& r = (*it)[2];
-      
-      if (r == 0 && b == 0 && g == 0){
-         r = 1; b = 1; g = 1;
-      }
-      
-      if (b > 50 &&
-          abs(b-g) < 10 && abs(g-b) < 10 && abs(b-r) < 10){
-         r = 0;
-         g = 0;
-         b = 0;
-      } 
-      
-      
-      
-   }
-   
-   
-   Mat ms[3];
-   split(copy, ms);
-   
-   Mat mask;
-   threshold(ms[0],mask,0,255,THRESH_BINARY);
-   
-   dilate(mask,mask,Mat());	
-   
-   return mask;
-}
-
-
-Mat
-cvgui::removeGrayBackground(const Mat& input){
-   
-//   Mat copy = input.clone();
-//   Mat mask;
-//   //  (Size(copy.rows,copy.cols), CV_8UC1);
-//   
-//   Mat_<Vec3b>::iterator it = copy.begin<Vec3b>(),
-//   itEnd = copy.end<Vec3b>();
-//   for(; it != itEnd; ++it){
-//      
-//      uchar& b = (*it)[0];
-//      uchar& g = (*it)[1];
-//      uchar& r = (*it)[2];
-//      
-//      if (r == 0 && b == 0 && g == 0){
-//         r = 1; b = 1; g = 1;
-//      }
-//      
-//      if (b > 50 &&
-//          abs(b-g) < 10 && abs(g-b) < 10 && abs(b-r) < 10){
-//         r = 0;
-//         g = 0;
-//         b = 0;
-//      } 
-//      
-//      
-//      
-//   }
-//   
-//   
-//   Mat ms[3];
-//   split(copy, ms);
-//   
-//   //threshold(ms[0],mask,0,255,THRESH_BINARY_INV);
-//   threshold(ms[0],mask,0,255,THRESH_BINARY);
-//   
-//   dilate(mask,mask,Mat());	
-//   
-//   
-//   vector<vector<Point> > contours;
-//   findContours(ms[0], contours, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_NONE);
-//   
-//   Scalar red(0,0,255);
-//   //drawContours(copy, contours, -1, red);
-//   
-//   
-//   vector<Rect> boundingRects;
-//   
-//   for (vector<vector<Point> >::iterator contour = contours.begin();
-//        contour != contours.end(); ++contour){
-//      
-//      
-//      double area = contourArea(Mat(*contour));
-//      
-//      Rect bound = boundingRect(Mat(*contour));
-//      
-//      
-//      if (bound.width * bound.height * 0.5 > area)
-//         continue;
-//      
-//      boundingRects.push_back(bound);
-//      
-//      rectangle(copy,