rhodes 3.0.2 → 3.1.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +13 -2
- data/Rakefile +200 -18
- data/bin/get-rhodes-info +1 -1
- data/doc/build.txt +174 -98
- data/doc/configuration.txt +13 -2
- data/doc/device-caps.txt +184 -24
- data/doc/extensions.txt +19 -1
- data/doc/generator.txt +18 -18
- data/doc/install.txt +15 -4
- data/doc/introduction.txt +19 -20
- data/doc/nfc.txt +1617 -513
- data/doc/release.txt +85 -41
- data/doc/rhom.txt +11 -1
- data/doc/simulator.txt +15 -5
- data/doc/synchronization.txt +21 -7
- data/doc/ui.txt +4 -0
- data/installer/rhostudio.nsi +464 -0
- data/lib/build/compileERB/bb.rb +26 -0
- data/lib/build/compileERB/default.rb +26 -0
- data/lib/build/compileRB/compileRB.rb +26 -0
- data/lib/build/jake.rb +27 -2
- data/lib/build/rhodes-build.rb +26 -0
- data/lib/extensions/barcode/ext.yml +3 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/AndroidManifest.xml +27 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/Rakefile +13 -13
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/cancel_icon.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_on.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/ok_icon.png} +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable-hdpi/retake_icon.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_on.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/cancel_icon.png} +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/disclosure.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/ok_icon.png} +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_radio_off.png → lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/drawable/retake_icon.png} +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/layout/capture.xml +122 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/raw/beep.ogg +0 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/attrs.xml +20 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/colors.xml +42 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/additional_files/res/values/ids.xml +31 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/ext_build.files +15 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/jni/src/barcode.cpp +16 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivity.java +778 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/CaptureActivityHandler.java +136 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeHandler.java +99 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/DecodeThread.java +121 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/FinishListener.java +48 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/InactivityTimer.java +71 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/LocaleManager.java +97 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/PlanarYUVLuminanceSource.java +133 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/ViewfinderResultPointCallback.java +34 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/ViewfinderView.java +157 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/AutoFocusCallback.java +51 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/CameraConfigurationManager.java +280 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/CameraManager.java +318 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/FlashlightManager.java +148 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/google/zxing/client/android/camera/PreviewCallback.java +59 -0
- data/lib/extensions/barcode/ext/barcode/platform/android/src/com/rhomobile/barcode/Barcode.java +44 -1
- data/lib/extensions/barcode/ext/barcode/platform/bb/Rakefile +1 -1
- data/lib/extensions/barcode/ext/barcode/platform/iphone/Classes/barcode.m +4 -0
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode.i +5 -0
- data/lib/extensions/barcode/ext/barcode/shared/ruby/barcode_wrap.c +138 -389
- data/lib/extensions/barcode/ext/barcode/shared/src/zbar.c +5 -0
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/README.TXT +5 -0
- data/lib/extensions/debugger/CHANGELOG +10 -0
- data/lib/extensions/debugger/LICENSE +21 -0
- data/lib/extensions/debugger/README.md +8 -0
- data/lib/extensions/debugger/debugger.rb +57 -9
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.h +24 -7
- data/lib/extensions/esri/ext/esri/platform/iphone/Classes/MapViewControllerESRI.m +18 -17
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/Nfc.java +9 -4
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcActivity.java +1 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessage.java +0 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcMessagePack.java +0 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcRecord.java +1 -1
- data/lib/extensions/nfc/ext/nfc/platform/android/src/com/rhomobile/nfc/NfcTechActivity.java +0 -1
- data/lib/extensions/nfc/nfc.rb +9 -3
- data/lib/extensions/rholang/rholang/lang_cs.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_da.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_de.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_es.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_es_ar.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_ko.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_nl.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_no.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_pt_br.rb +4 -4
- data/lib/extensions/rholang/rholang/lang_se.rb +3 -3
- data/lib/extensions/rholang/rholang/lang_sr.rb +3 -3
- data/lib/framework/builtinME.rb +31 -2
- data/lib/framework/dateME.rb +26 -0
- data/lib/framework/res/back_btn.sym.png +0 -0
- data/lib/framework/res/blue_pushpin_small.sym.png +0 -0
- data/lib/framework/res/callout.sym.png +0 -0
- data/lib/framework/res/callout_link.sym.png +0 -0
- data/lib/framework/res/esri.sym.png +0 -0
- data/lib/framework/res/forward_btn.sym.png +0 -0
- data/lib/framework/res/home_btn.sym.png +0 -0
- data/{platform/wp7/WPApplication/rho/apps/public/images/android/btn_check_off.png → lib/framework/res/options_btn.sym.png} +0 -0
- data/lib/framework/res/refresh_btn.sym.png +0 -0
- data/lib/framework/rho/mapview.rb +26 -0
- data/lib/framework/rho/render.rb +34 -2
- data/lib/framework/rho/rho.rb +28 -2
- data/lib/framework/rho/rhoapplication.rb +26 -0
- data/lib/framework/rho/rhobluetooth.rb +70 -0
- data/lib/framework/rho/rhocontact.rb +26 -0
- data/lib/framework/rho/rhocontroller.rb +26 -0
- data/lib/framework/rho/rhoerror.rb +26 -0
- data/lib/framework/rho/rhoevent.rb +26 -0
- data/lib/framework/rho/rhoevent_bb.rb +26 -0
- data/lib/framework/rho/rhoevent_c.rb +26 -0
- data/lib/framework/rho/rhofsconnector.rb +25 -0
- data/lib/framework/rho/rhomsg.rb +26 -0
- data/lib/framework/rho/rhonativeviewmanager.rb +25 -0
- data/lib/framework/rho/rhosupport.rb +32 -1
- data/lib/framework/rho/rhotabbar.rb +27 -1
- data/lib/framework/rho/rhotoolbar.rb +26 -1
- data/lib/framework/rho/rhoutils.rb +26 -0
- data/lib/framework/rho/rhoviewhelpers.rb +26 -0
- data/lib/framework/rhoappmanifest.rb +26 -0
- data/lib/framework/rhodes.rb +1 -1
- data/lib/framework/rhoframework.rb +77 -0
- data/lib/framework/rhom/rhom.rb +30 -19
- data/lib/framework/rhom/rhom_db_adapter.rb +26 -19
- data/lib/framework/rhom/rhom_model.rb +25 -0
- data/lib/framework/rhom/rhom_object.rb +26 -19
- data/lib/framework/rhom/rhom_object_factory.rb +73 -55
- data/lib/framework/rhom/rhom_source.rb +26 -0
- data/lib/framework/rhosystem.rb +47 -16
- data/lib/framework/version.rb +1 -1
- data/lib/rhodes.rb +1 -1
- data/platform/android/Rhodes/AndroidManifest.xml +5 -4
- data/platform/android/Rhodes/default.properties +1 -1
- data/platform/android/Rhodes/jni/Android.mk +365 -0
- data/platform/android/Rhodes/jni/Application.mk +3 -0
- data/platform/android/Rhodes/jni/genconfig.h +17 -0
- data/platform/android/Rhodes/jni/include/rhodes.h +26 -0
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhoRuby.h +71 -0
- data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h +47 -33
- data/platform/android/Rhodes/jni/include/rhodes/RhoClassFactory.h +46 -1
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhoLogConf.h +11 -11
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_RhodesService.h +1 -9
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_camera_Camera.h +2 -2
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_file_RhoFileApi.h +8 -0
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_mainview_SplashScreen.h +39 -0
- data/platform/android/Rhodes/jni/include/rhodes/rhocryptimpl.h +26 -0
- data/platform/android/Rhodes/jni/include/rhodes/sslimpl.h +26 -0
- data/platform/android/Rhodes/jni/rhocaps.inc +12 -0
- data/platform/android/Rhodes/jni/src/JNIRhoRuby.cpp +204 -0
- data/platform/android/Rhodes/jni/src/RhoClassFactory.cpp +32 -5
- data/platform/android/Rhodes/jni/src/alert.cpp +29 -5
- data/platform/android/Rhodes/jni/src/bluetooth.cpp +68 -3
- data/platform/android/Rhodes/jni/src/callbacks.cpp +40 -15
- data/platform/android/Rhodes/jni/src/camera.cpp +84 -7
- data/platform/android/Rhodes/jni/src/datetimepicker.cpp +26 -0
- data/platform/android/Rhodes/jni/src/event.cpp +27 -0
- data/platform/android/Rhodes/jni/src/fileapi.cpp +66 -2
- data/platform/android/Rhodes/jni/src/geolocation.cpp +26 -0
- data/platform/android/Rhodes/jni/src/logconf.cpp +44 -29
- data/platform/android/Rhodes/jni/src/logger.cpp +26 -0
- data/platform/android/Rhodes/jni/src/mapview.cpp +30 -0
- data/platform/android/Rhodes/jni/src/menu.cpp +26 -0
- data/platform/android/Rhodes/jni/src/nativebar.cpp +27 -8
- data/platform/android/Rhodes/jni/src/nativeview.cpp +26 -0
- data/platform/android/Rhodes/jni/src/navbar.cpp +27 -0
- data/platform/android/Rhodes/jni/src/phonebook.cpp +27 -0
- data/platform/android/Rhodes/jni/src/rhoconf.cpp +26 -0
- data/platform/android/Rhodes/jni/src/rhocryptimpl.cpp +26 -0
- data/platform/android/Rhodes/jni/src/rhodes.cpp +40 -593
- data/platform/android/Rhodes/jni/src/rhodesapp.cpp +326 -0
- data/platform/android/Rhodes/jni/src/rhodessystem.cpp +186 -0
- data/platform/android/Rhodes/jni/src/ringtones.cpp +27 -0
- data/platform/android/Rhodes/jni/src/signature.cpp +26 -0
- data/platform/android/Rhodes/jni/src/socketimpl.cpp +26 -0
- data/platform/android/Rhodes/jni/src/splashscreen.cpp +30 -4
- data/platform/android/Rhodes/jni/src/sslimpl.cpp +27 -0
- data/platform/android/Rhodes/jni/src/webview.cpp +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NativeLibraries.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/Push.java +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java +29 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java +36 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java +81 -73
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityListener.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivityStartupListeners.java +1 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java +83 -38
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/StatusNotification.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java +33 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java +35 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java +52 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerNew.java +182 -56
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java +41 -2
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java +60 -23
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java +162 -27
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraNewService.java +152 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraOldService.java +49 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSemiService.java +140 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraService.java +49 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/CameraSettings.java +147 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java +27 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java +124 -53
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java +39 -25
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java +75 -9
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java +28 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{SplashScreen.java → mainview/SplashScreen.java} +73 -22
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java +27 -21
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/AnnotationsOverlay.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/ExtrasHolder.java +51 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/GoogleMapView.java +41 -3
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapTouch.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java +26 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java +25 -19
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java +28 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java +85 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java +32 -30
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java +29 -28
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/ExternalHttpHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java +25 -20
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/ContextFactory.java +38 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/util/PhoneId.java +137 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/{Utils.java → util/Utils.java} +27 -17
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java +27 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java +26 -0
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java +107 -0
- data/platform/android/build/RhodesSRC_build.files +11 -4
- data/platform/android/build/android.rake +79 -116
- data/platform/android/build/android_tools.rb +117 -0
- data/platform/android/build/androidcommon.rb +30 -4
- data/platform/android/build/libjson_build.files +1 -1
- data/platform/android/build/librhodes_build.files +3 -0
- data/platform/bb/Hsqldb/src/com/rho/db/FileUtilBB.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBResult.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBRowResult.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/HsqlDBStorage.java +26 -0
- data/platform/bb/Hsqldb/src/com/rho/db/Journal.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/math/BigDecimal.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/math/BigInteger.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Date.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Time.java +26 -0
- data/platform/bb/Hsqldb/src/j2me/sql/Timestamp.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/DateTimeTokenizer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/FilePath.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/IRhoLogSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/IRhoRubyHelper.java +27 -0
- data/platform/bb/RubyVM/src/com/rho/Mutex.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Properties.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoAppAdapter.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoClassFactory.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoConf.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoCrypto.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoEmptyLogger.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoEmptyProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogConf.java +52 -1
- data/platform/bb/RubyVM/src/com/rho/RhoLogFileSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogOutputSink.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoLogger.java +111 -2
- data/platform/bb/RubyVM/src/com/rho/RhoParamArray.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoParams.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoRuby.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoThread.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhoTimer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/RhodesApp.java +32 -3
- data/platform/bb/RubyVM/src/com/rho/SplashScreen.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Sprintf.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/StringScanner.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TestProfiler.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TestRhoLog.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/ThreadQueue.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/TimeInterval.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/Tokenizer.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBAdapter.java +32 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBAttrManager.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/DBException.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBCallback.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBResult.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/db/IDBStorage.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/FileAccessBB.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IFileAccess.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/IRAFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/RandomAccessFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/file/SimpleFile.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/AsyncHttp.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/IHttpConnection.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/net/NetRequest.java +295 -230
- data/platform/bb/RubyVM/src/com/rho/net/RhoConnection.java +29 -16
- data/platform/bb/RubyVM/src/com/rho/rjson/RJSONTokener.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncProtocol.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/ISyncStatusListener.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONArrayIterator.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONEntry.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/JSONStructIterator.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java +26 -19
- data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java +26 -0
- data/platform/bb/RubyVM/src/com/rho/sync/SyncProtocol_3.java +31 -5
- data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java +49 -37
- data/platform/bb/RubyVM/src/com/rho/sync/SyncThread.java +40 -18
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyDir.java +2 -1
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyIOFileExecutor.java +7 -2
- data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyTime.java +43 -13
- data/platform/bb/RubyVM/src/j2me/lang/ArrayMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/AssertMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/CalendarMe.java +28 -1
- data/platform/bb/RubyVM/src/j2me/lang/CharacterDataLatin1.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/CharacterMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/Convert.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/MathEx.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/PrintStreamMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/StringBufferMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/StringMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/SystemMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/lang/TimeZoneMe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeDigit.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeInt.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/HugeIntHelper.java +26 -0
- data/platform/bb/RubyVM/src/j2me/math/Number.java +26 -0
- data/platform/bb/RubyVM/src/j2me/nio/channels/FileChannel.java +26 -0
- data/platform/bb/RubyVM/src/j2me/nio/channels/Pipe.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/WeakHashMap.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/concurrent/ConcurrentHashMap.java +26 -0
- data/platform/bb/RubyVM/src/j2me/util/concurrent/locks/ReentrantLock.java +26 -0
- data/platform/bb/build/bb.rake +45 -6
- data/platform/bb/rhodes/platform/4.2.0/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2.1/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2.2/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.2/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/4.7/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/platform/5.0/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/platform/common/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BBVersionSpecific.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter.java +26 -0
- data/platform/bb/rhodes/src/com/rho/BrowserAdapter5.java +26 -0
- data/platform/bb/rhodes/src/com/rho/IBrowserAdapter.java +26 -0
- data/platform/bb/rhodes/src/com/rho/RhoMainScreen.java +26 -0
- data/platform/bb/rhodes/src/com/rho/RhoRubyHelper.java +45 -1
- data/platform/bb/rhodes/src/com/rho/RhodesApplicationPlatform.java +26 -0
- data/platform/bb/rhodes/src/com/rho/Version.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteCopyResult.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteResult.java +26 -0
- data/platform/bb/rhodes/src/com/rho/db/SqliteStorage.java +26 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75File.java +26 -0
- data/platform/bb/rhodes/src/com/rho/file/Jsr75RAFileImpl.java +28 -2
- data/platform/bb/rhodes/src/com/rho/file/PersistRAFileImpl.java +29 -2
- data/platform/bb/rhodes/src/com/rho/net/BaseSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/NetworkAccess.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/SSLSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/TCPSocket.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java +26 -0
- data/platform/bb/rhodes/src/com/rho/net/bb/NativeBBHttpConnection.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/Alert.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/GeoLocation.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/RhoPhonebook.java +26 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/System.java +27 -1
- data/platform/bb/rhodes/src/com/rho/rubyext/WebView.java +59 -0
- data/platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/LogOptionsScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/LogScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/NativeBar.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java +27 -1
- data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/RingtoneManager.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/SecondaryResourceFetchThread.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/Utilities.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothManager.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/Camera.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/camera/ImageBrowserScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimePicker.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/datetime/DateTimeScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapField.java +736 -695
- data/platform/bb/rhodes/src/rhomobile/mapview/ESRIMapProvider.java +40 -14
- data/platform/bb/rhodes/src/rhomobile/mapview/GeoCoding.java +39 -13
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleGeoCoding.java +216 -174
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java +87 -45
- data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapProvider.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapProvider.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapTools.java +105 -79
- data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewParent.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java +26 -0
- data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.java +26 -0
- data/platform/iphone/Classes/AppManager/AppLoader.h +25 -7
- data/platform/iphone/Classes/AppManager/AppLoader.m +26 -7
- data/platform/iphone/Classes/AppManager/AppManager.h +25 -7
- data/platform/iphone/Classes/AppManager/AppManager.m +26 -8
- data/platform/iphone/Classes/AppManager/AppManagerI.h +25 -8
- data/platform/iphone/Classes/Bluetooth/Bluetooth.h +39 -10
- data/platform/iphone/Classes/Bluetooth/Bluetooth.m +158 -28
- data/platform/iphone/Classes/Camera/PickImageDelegate.h +72 -9
- data/platform/iphone/Classes/Camera/PickImageDelegate.m +432 -15
- data/platform/iphone/Classes/DateTime.h +25 -7
- data/platform/iphone/Classes/DateTime.m +25 -7
- data/platform/iphone/Classes/DateTimePicker.m +25 -7
- data/platform/iphone/Classes/DateTimePickerDelegate.h +25 -7
- data/platform/iphone/Classes/DateTimePickerDelegate.m +25 -7
- data/platform/iphone/Classes/Dispatcher/Dispatcher.c +26 -8
- data/platform/iphone/Classes/Dispatcher/Dispatcher.h +25 -8
- data/platform/iphone/Classes/Event/Event.h +25 -7
- data/platform/iphone/Classes/GeoLocation/LocationController.h +25 -7
- data/platform/iphone/Classes/LogOptionsController.h +25 -7
- data/platform/iphone/Classes/LogOptionsController.m +25 -7
- data/platform/iphone/Classes/LogViewController.h +25 -7
- data/platform/iphone/Classes/LogViewController.m +27 -9
- data/platform/iphone/Classes/MapView/GoogleGeocoder.h +26 -0
- data/platform/iphone/Classes/MapView/GoogleGeocoder.m +26 -0
- data/platform/iphone/Classes/MapView/MapAnnotation.h +26 -6
- data/platform/iphone/Classes/MapView/MapAnnotation.m +25 -6
- data/platform/iphone/Classes/MapView/MapViewController.h +27 -8
- data/platform/iphone/Classes/MapView/MapViewController.m +26 -6
- data/platform/iphone/Classes/MapView/MapViewManager.h +26 -4
- data/platform/iphone/Classes/MapView/MapViewManager.m +25 -5
- data/platform/iphone/Classes/NativeBar.h +25 -7
- data/platform/iphone/Classes/NativeBar.m +54 -39
- data/platform/iphone/Classes/NativeView/NVDelegate.h +25 -7
- data/platform/iphone/Classes/NativeView/NVDelegate.m +25 -7
- data/platform/iphone/Classes/NativeView/NVViewController.h +25 -7
- data/platform/iphone/Classes/NativeView/NVViewController.m +25 -7
- data/platform/iphone/Classes/NativeView/RhoNativeViewManager.mm +27 -10
- data/platform/iphone/Classes/NativeView/RhoNativeViewManagerOC.h +25 -7
- data/platform/iphone/Classes/NavBar.h +25 -7
- data/platform/iphone/Classes/NavBar.m +25 -7
- data/platform/iphone/Classes/Phonebook/phonebook.h +26 -8
- data/platform/iphone/Classes/Phonebook/phonebook.m +25 -8
- data/platform/iphone/Classes/RhoAlert.h +25 -7
- data/platform/iphone/Classes/RhoAlert.m +27 -9
- data/platform/iphone/Classes/RhoDelegate.h +25 -7
- data/platform/iphone/Classes/RhoDelegate.m +25 -7
- data/platform/iphone/Classes/RhoMainView.h +26 -8
- data/platform/iphone/Classes/RhoViewController.h +25 -7
- data/platform/iphone/Classes/RhoViewController.m +25 -7
- data/platform/iphone/Classes/Rhodes.h +25 -8
- data/platform/iphone/Classes/Rhodes.m +50 -6
- data/platform/iphone/Classes/RingtoneManager.h +25 -7
- data/platform/iphone/Classes/RingtoneManager.m +25 -7
- data/platform/iphone/Classes/Signature/SignatureDelegate.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureDelegate.m +25 -7
- data/platform/iphone/Classes/Signature/SignatureView.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureView.m +25 -15
- data/platform/iphone/Classes/Signature/SignatureViewController.h +25 -7
- data/platform/iphone/Classes/Signature/SignatureViewController.m +25 -7
- data/platform/iphone/Classes/SimpleMainView.h +25 -7
- data/platform/iphone/Classes/SimpleMainView.m +31 -7
- data/platform/iphone/Classes/SplashViewController.h +25 -7
- data/platform/iphone/Classes/SplashViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/LeftViewController.h +25 -7
- data/platform/iphone/Classes/SplitView/LeftViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/RightViewController.h +25 -7
- data/platform/iphone/Classes/SplitView/RightViewController.m +25 -7
- data/platform/iphone/Classes/SplitView/SplitViewDelegate.h +25 -7
- data/platform/iphone/Classes/SplitView/SplitViewDelegate.m +25 -7
- data/platform/iphone/Classes/SplitView/SplittedMainView.h +25 -7
- data/platform/iphone/Classes/SplitView/SplittedMainView.m +29 -7
- data/platform/iphone/Classes/TabbedMainView.h +25 -7
- data/platform/iphone/Classes/TabbedMainView.m +42 -20
- data/platform/iphone/Classes/Utils/ParamsWrapper.h +25 -7
- data/platform/iphone/Classes/Utils/ParamsWrapper.m +25 -7
- data/platform/iphone/Classes/WebView.m +25 -7
- data/platform/iphone/Classes/rho/common/SplashScreenImpl.cpp +25 -8
- data/platform/iphone/Classes/rho/common/SplashScreenImpl.h +25 -8
- data/platform/iphone/Classes/rho/net/NetRequestImpl.m +26 -19
- data/platform/iphone/Info.plist +1 -1
- data/platform/iphone/Tests/Classes/TestsAppDelegate.h +25 -7
- data/platform/iphone/Tests/Classes/TestsAppDelegate.m +25 -7
- data/platform/iphone/main.m +25 -7
- data/platform/iphone/rbuild/findRhodesGuid.rb +26 -0
- data/platform/iphone/rbuild/iphone.rake +42 -6
- data/platform/iphone/rhoextlib/dosyscall.c +26 -0
- data/platform/iphone/rhoextlib/syscall.c +26 -0
- data/platform/iphone/rhoextlib/syscall.h +26 -7
- data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj +2 -0
- data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj +8 -8
- data/platform/linux/Rakefile +26 -0
- data/platform/linux/tasks/linux.rake +26 -0
- data/platform/osx/Rhodes Debugger/DataSource.h +26 -0
- data/platform/osx/Rhodes Debugger/DebugConnection.h +25 -4
- data/platform/osx/Rhodes Debugger/DebuggerController.h +26 -0
- data/platform/osx/Rhodes Debugger/FileSystemItem.h +26 -0
- data/platform/osx/Rhodes Debugger/GdbConnection.h +25 -7
- data/platform/osx/Rhodes Debugger/LogController.h +25 -3
- data/platform/osx/Rhodes Debugger/TcpConnection.h +25 -4
- data/platform/osx/Rhodes Launcher/RhodesController.h +25 -7
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtCore.framework/Versions/4/QtCore +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/classes.nib +59 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/info.nib +18 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Resources/qt_menu.nib/keyedobjects.nib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtGui.framework/Versions/4/QtGui +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtNetwork.framework/Versions/4/QtNetwork +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/QtWebKit.framework/Versions/4/QtWebKit +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Frameworks/phonon.framework/Versions/4/phonon +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist +20 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/MacOS/RhoSimulator +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PkgInfo +1 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqgif.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqico.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqjpeg.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqmng.dylib +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/PlugIns/imageformats/libqtiff.dylib +0 -0
- data/platform/{symbian/build/rhologpath.txt → osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/empty.lproj} +0 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/qt.conf +2 -0
- data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Resources/rho.icns +0 -0
- data/platform/osx/build/osx.rake +88 -0
- data/platform/shared/{SyncClient/SyncClient.cpp → RhoConnectClient/RhoConnectClient.cpp} +78 -52
- data/platform/shared/RhoConnectClient/RhoConnectClient.h +121 -0
- data/platform/shared/RhoConnectClient/RhoError.h +55 -0
- data/platform/shared/common/AppMenu.cpp +26 -0
- data/platform/shared/common/AppMenu.h +26 -0
- data/platform/shared/common/AutoPointer.h +26 -0
- data/platform/shared/common/IRhoBrowser.h +26 -0
- data/platform/shared/common/IRhoClassFactory.h +26 -0
- data/platform/shared/common/IRhoCrypt.h +26 -0
- data/platform/shared/common/IRhoThreadImpl.h +26 -0
- data/platform/shared/common/InputStream.h +26 -0
- data/platform/shared/common/PosixThreadImpl.cpp +31 -0
- data/platform/shared/common/PosixThreadImpl.h +26 -0
- data/platform/shared/common/RhoAppAdapter.h +26 -0
- data/platform/shared/common/RhoConf.cpp +28 -2
- data/platform/shared/common/RhoConf.h +32 -1
- data/platform/shared/common/RhoDefs.h +32 -0
- data/platform/shared/common/RhoFatalError.h +27 -1
- data/platform/shared/common/RhoFile.cpp +30 -4
- data/platform/shared/common/RhoFile.h +26 -0
- data/platform/shared/common/RhoFilePath.h +26 -0
- data/platform/shared/common/RhoMath.cpp +26 -0
- data/platform/shared/common/RhoMath.h +26 -0
- data/platform/shared/common/RhoMutexLock.h +39 -3
- data/platform/shared/common/RhoNativeViewManager.h +26 -0
- data/platform/shared/common/RhoPort.h +55 -17
- data/platform/shared/common/RhoSimConf.cpp +58 -0
- data/platform/shared/common/RhoSimConf.h +62 -0
- data/platform/shared/common/RhoStd.h +26 -0
- data/platform/shared/common/RhoSystem.h +28 -2
- data/platform/shared/common/RhoThread.cpp +26 -0
- data/platform/shared/common/RhoThread.h +26 -0
- data/platform/shared/common/RhoTime.cpp +26 -0
- data/platform/shared/common/RhoTime.h +33 -4
- data/platform/shared/common/RhodesApp.cpp +170 -68
- data/platform/shared/common/RhodesApp.h +34 -6
- data/platform/shared/common/RhodesAppBase.cpp +77 -8
- data/platform/shared/common/RhodesAppBase.h +31 -4
- data/platform/shared/common/SplashScreen.cpp +29 -0
- data/platform/shared/common/SplashScreen.h +26 -0
- data/platform/shared/common/StringConverter.h +26 -0
- data/platform/shared/common/ThreadQueue.cpp +26 -0
- data/platform/shared/common/ThreadQueue.h +26 -0
- data/platform/shared/common/Tokenizer.cpp +26 -0
- data/platform/shared/common/Tokenizer.h +26 -0
- data/platform/shared/common/iphone/RhoClassFactory.cpp +26 -0
- data/platform/shared/common/iphone/RhoClassfactory.h +44 -4
- data/platform/shared/common/iphone/RhoCryptImpl.h +26 -0
- data/platform/shared/common/iphone/RhoCryptImpl.mm +26 -0
- data/platform/shared/common/iphone/RhoFileImpl.m +26 -7
- data/platform/shared/common/iphone/RhoThreadImpl.m +26 -7
- data/platform/shared/common/map/ESRIMapEngine.cpp +26 -0
- data/platform/shared/common/map/ESRIMapEngine.h +26 -0
- data/platform/shared/common/map/GoogleMapEngine.cpp +26 -0
- data/platform/shared/common/map/GoogleMapEngine.h +26 -0
- data/platform/shared/common/map/MapEngine.cpp +28 -2
- data/platform/shared/common/map/MapEngine.h +26 -0
- data/platform/shared/common/rhoparams.cpp +26 -0
- data/platform/shared/common/rhoparams.h +26 -0
- data/platform/shared/common/stat.h +26 -0
- data/platform/shared/curl/lib/config-symbian.h +824 -0
- data/platform/shared/curl/lib/hostip.c +7 -0
- data/platform/shared/curl/lib/http.c +6 -0
- data/platform/shared/curl/lib/setup_once.h +4 -0
- data/platform/shared/db/DBAdapter.cpp +34 -2
- data/platform/shared/db/DBAdapter.h +26 -0
- data/platform/shared/db/DBAttrManager.cpp +26 -0
- data/platform/shared/db/DBAttrManager.h +26 -0
- data/platform/shared/db/DBResult.cpp +26 -0
- data/platform/shared/db/DBResult.h +26 -0
- data/platform/shared/json/JSONIterator.cpp +26 -0
- data/platform/shared/json/JSONIterator.h +26 -0
- data/platform/shared/json/RJSONTokener.c +3 -3
- data/platform/shared/json/json.h +1 -1
- data/platform/shared/json/{debug.c → json_debug.c} +2 -2
- data/platform/shared/json/{debug.h → json_debug.h} +1 -1
- data/platform/shared/json/json_object.c +1 -1
- data/platform/shared/json/json_tokener.c +1 -1
- data/platform/shared/json/json_util.c +1 -1
- data/platform/shared/json/printbuf.c +1 -1
- data/platform/shared/logging/RhoATLTrace.h +26 -0
- data/platform/shared/logging/RhoLog.cpp +90 -0
- data/platform/shared/logging/RhoLog.h +29 -1
- data/platform/shared/logging/RhoLogCat.h +26 -0
- data/platform/shared/logging/RhoLogConf.cpp +72 -10
- data/platform/shared/logging/RhoLogConf.h +39 -5
- data/platform/shared/logging/RhoLogSink.cpp +26 -0
- data/platform/shared/logging/RhoLogSink.h +26 -0
- data/platform/shared/logging/RhoPlainLog.cpp +36 -8
- data/platform/shared/logging/test/TestLog.cpp +26 -0
- data/platform/shared/logging/test/TestPlainLog.c +26 -0
- data/platform/shared/logging/test/main.cpp +26 -0
- data/platform/shared/net/AsyncHttp.cpp +27 -0
- data/platform/shared/net/AsyncHttp.h +28 -1
- data/platform/shared/net/CURLNetRequest.cpp +81 -11
- data/platform/shared/net/CURLNetRequest.h +30 -0
- data/platform/shared/net/CompatWince.cpp +26 -0
- data/platform/shared/net/CompatWince.h +26 -0
- data/platform/shared/net/HttpServer.cpp +82 -23
- data/platform/shared/net/HttpServer.h +27 -1
- data/platform/shared/net/INetRequest.cpp +26 -0
- data/platform/shared/net/INetRequest.h +26 -0
- data/platform/shared/net/RawSocket.cpp +38 -12
- data/platform/shared/net/RawSocket.h +28 -2
- data/platform/shared/net/URI.cpp +26 -6
- data/platform/shared/net/URI.h +26 -2
- data/platform/shared/net/iphone/sslimpl.cpp +39 -10
- data/platform/shared/net/iphone/sslimpl.h +25 -8
- data/platform/shared/net/ssl.cpp +26 -0
- data/platform/shared/net/ssl.h +26 -0
- data/platform/shared/qt/RhoSimulator.pro +7 -0
- data/platform/shared/qt/curl/curl.pro +181 -0
- data/platform/shared/qt/pbxproj2pro.pl +21 -0
- data/platform/shared/qt/pro_vcproj_diff.pl +59 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.cpp +91 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.h +54 -0
- data/platform/shared/qt/rhodes/DateTimeDialog.ui +68 -0
- data/platform/shared/qt/rhodes/ExternalWebView.cpp +46 -0
- data/platform/shared/qt/rhodes/ExternalWebView.h +49 -0
- data/platform/{wm/rhodes/emulator → shared/qt/rhodes}/ExternalWebView.ui +0 -0
- data/platform/shared/qt/rhodes/MainWindowCallback.h +51 -0
- data/platform/shared/qt/rhodes/QtMainWindow.cpp +819 -0
- data/platform/shared/qt/rhodes/QtMainWindow.h +148 -0
- data/platform/{wm/rhodes/emulator → shared/qt/rhodes}/QtMainWindow.ui +13 -1
- data/platform/shared/qt/rhodes/QtNativeTabBar.cpp +112 -0
- data/platform/shared/qt/rhodes/QtNativeTabBar.h +37 -0
- data/platform/shared/qt/rhodes/QtWebInspector.cpp +71 -0
- data/platform/shared/qt/rhodes/QtWebInspector.h +53 -0
- data/platform/shared/qt/rhodes/QtWebInspector.ui +41 -0
- data/platform/shared/qt/rhodes/impl/AlertImpl.cpp +153 -0
- data/platform/shared/qt/rhodes/impl/AlertImpl.h +65 -0
- data/platform/shared/qt/rhodes/impl/BluetoothImpl.cpp +109 -0
- data/platform/shared/qt/rhodes/impl/CalendarImpl.cpp +52 -0
- data/platform/shared/qt/rhodes/impl/CameraImpl.cpp +54 -0
- data/platform/shared/qt/rhodes/impl/DateTimePickerImpl.cpp +61 -0
- data/platform/shared/qt/rhodes/impl/DateTimePickerImpl.h +70 -0
- data/platform/shared/qt/rhodes/impl/GeoLocationImpl.cpp +65 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.cpp +727 -0
- data/platform/shared/qt/rhodes/impl/MainWindowImpl.h +160 -0
- data/platform/shared/qt/rhodes/impl/MapViewImpl.cpp +60 -0
- data/platform/shared/qt/rhodes/impl/NativeTabbarImpl.cpp +131 -0
- data/platform/shared/qt/rhodes/impl/NativeTabbarImpl.h +96 -0
- data/platform/shared/qt/rhodes/impl/NativeToolbarImpl.cpp +124 -0
- data/platform/shared/qt/rhodes/impl/NativeToolbarImpl.h +71 -0
- data/platform/shared/qt/rhodes/impl/PhonebookImpl.cpp +103 -0
- data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.cpp +56 -0
- data/platform/shared/qt/rhodes/impl/RhoClassFactoryImpl.h +82 -0
- data/platform/shared/qt/rhodes/impl/RhoFileImpl.cpp +63 -0
- data/platform/shared/qt/rhodes/impl/RhoNativeViewManagerImpl.cpp +86 -0
- data/platform/shared/qt/rhodes/impl/RhoThreadImpl.cpp +114 -0
- data/platform/shared/qt/rhodes/impl/RhoThreadImpl.h +72 -0
- data/platform/shared/qt/rhodes/impl/RhodesImpl.cpp +193 -0
- data/platform/shared/qt/rhodes/impl/RingtoneManagerImpl.cpp +51 -0
- data/platform/shared/qt/rhodes/impl/SignatureImpl.cpp +43 -0
- data/platform/shared/qt/rhodes/impl/SystemImpl.cpp +229 -0
- data/platform/shared/qt/rhodes/impl/WebViewImpl.cpp +114 -0
- data/platform/shared/qt/rhodes/main.cpp +208 -0
- data/platform/shared/qt/rhodes/resources/rho.icns +0 -0
- data/platform/shared/qt/rhodes/resources/rho.ico +0 -0
- data/platform/shared/qt/rhodes/rhodes.pro +133 -0
- data/platform/shared/qt/rholib/rholib.pro +138 -0
- data/platform/shared/qt/rubylib/rubylib.pro +183 -0
- data/platform/shared/qt/sqlite3/sqlite3.pro +40 -0
- data/platform/shared/qt/syncengine/syncengine.pro +82 -0
- data/platform/shared/ruby/ext/alert/alert.i +13 -5
- data/platform/shared/ruby/ext/alert/alert_wrap.c +100 -11
- data/platform/shared/ruby/ext/asynchttp/asynchttp_wrap.c +391 -111
- data/platform/shared/ruby/ext/bluetooth/bluetooth.i +28 -14
- data/platform/shared/ruby/ext/bluetooth/bluetooth_wrap.c +311 -424
- data/platform/shared/ruby/ext/calendar/calendar_wrap.c +2278 -2278
- data/platform/shared/ruby/ext/calendar/event_wrap.c +2152 -2151
- data/platform/shared/ruby/ext/camera/camera.i +22 -2
- data/platform/shared/ruby/ext/camera/camera_wrap.c +448 -115
- data/platform/shared/ruby/ext/datetimepicker/datetimepicker_wrap.c +404 -126
- data/platform/shared/ruby/ext/geolocation/geolocation_wrap.c +17 -14
- data/platform/shared/ruby/ext/mapview/mapview_wrap.c +384 -104
- data/platform/shared/ruby/ext/nativebar/nativebar.i +0 -3
- data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c +0 -35
- data/platform/shared/ruby/ext/nativeviewmanager/nativeviewmanager_wrap.c +5 -5
- data/platform/shared/ruby/ext/navbar/navbar_wrap.c +384 -104
- data/platform/shared/ruby/ext/phonebook/phonebook.h +26 -0
- data/platform/shared/ruby/ext/phonebook/phonebook_wrap.c +422 -144
- data/platform/shared/ruby/ext/rho/rhoruby.c +56 -13
- data/platform/shared/ruby/ext/rho/rhoruby.h +30 -10
- data/platform/shared/ruby/ext/rho/rhosupport.c +106 -33
- data/platform/shared/ruby/ext/rhoconf/rhoconf.i +6 -2
- data/platform/shared/ruby/ext/rhoconf/rhoconf_wrap.c +24 -8
- data/platform/shared/ruby/ext/ringtones/ringtones_wrap.c +389 -109
- data/platform/shared/ruby/ext/signature/signature.i +1 -1
- data/platform/shared/ruby/ext/signature/signature_wrap.c +5 -5
- data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c +26 -0
- data/platform/shared/ruby/ext/syncengine/syncengine.i +4 -0
- data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c +25 -5
- data/platform/shared/ruby/ext/system/system_wrap.c +3 -3
- data/platform/shared/ruby/ext/webview/webview.i +4 -0
- data/platform/shared/ruby/ext/webview/webview_wrap.c +428 -134
- data/platform/shared/ruby/gc.c +4 -0
- data/platform/shared/ruby/hash.c +3 -0
- data/platform/shared/ruby/include/ruby/defines.h +20 -1
- data/platform/shared/ruby/include/ruby/intern.h +2 -0
- data/platform/shared/ruby/include/ruby/ruby.h +7 -4
- data/platform/shared/ruby/io.c +2 -1
- data/platform/shared/ruby/iphone/ruby/config.h +2 -0
- data/platform/shared/ruby/missing/dup2.c +1 -0
- data/platform/shared/ruby/signal.c +5 -5
- data/platform/shared/ruby/symbian/assert.h +2 -2
- data/platform/shared/ruby/symbian/ruby/config.h +13 -3
- data/platform/shared/ruby/symbian/symbian.h +2 -2
- data/platform/shared/ruby/thread_pthread.c +1 -1
- data/platform/shared/ruby/win32/assert.h +27 -1
- data/platform/shared/rubyext/GeoLocation.cpp +26 -0
- data/platform/shared/rubyext/GeoLocation.h +26 -0
- data/platform/shared/rubyext/NativeToolbarExt.h +35 -0
- data/platform/shared/rubyext/RhoAppAdapter.cpp +26 -0
- data/platform/shared/rubyext/System.cpp +54 -1
- data/platform/shared/rubyext/WebView.h +26 -0
- data/platform/shared/sqlite/crypto.c +26 -0
- data/platform/shared/sqlite/sqlite3.c +9706 -4596
- data/platform/shared/sqlite/sqlite3.h +521 -119
- data/platform/shared/statistic/RhoProfiler.cpp +26 -0
- data/platform/shared/statistic/RhoProfiler.h +26 -0
- data/platform/shared/statistic/test/TestProfiling.cpp +26 -0
- data/platform/shared/sync/ClientRegister.cpp +29 -1
- data/platform/shared/sync/ClientRegister.h +26 -0
- data/platform/shared/sync/ISyncProtocol.h +27 -1
- data/platform/shared/sync/SyncEngine.cpp +26 -0
- data/platform/shared/sync/SyncEngine.h +27 -1
- data/platform/shared/sync/SyncNotify.cpp +28 -1
- data/platform/shared/sync/SyncNotify.h +26 -0
- data/platform/shared/sync/SyncProtocol_3.h +34 -6
- data/platform/shared/sync/SyncSource.cpp +52 -17
- data/platform/shared/sync/SyncSource.h +26 -0
- data/platform/shared/sync/SyncThread.cpp +41 -0
- data/platform/shared/sync/SyncThread.h +27 -2
- data/platform/shared/sync/Test/NetDataStub.h +26 -0
- data/platform/shared/sync/Test/SyncEngine_test.cpp +26 -0
- data/platform/shared/sync/Test/SyncSource_test.cpp +26 -0
- data/platform/shared/tcmalloc/rhomem.h +1 -1
- data/platform/shared/test/Tests.cpp +28 -2
- data/platform/shared/test/test_helper.cpp +26 -0
- data/platform/shared/test/test_helper.h +26 -0
- data/platform/shared/unzip/unzip.cpp +10 -4
- data/platform/shared/unzip/unzip.h +8 -0
- data/platform/shared/xruby/src/com/xruby/compiler/parser/RubyParser.java +97 -97
- data/platform/symbian/build/symbian.rake +202 -0
- data/platform/symbian/curl/curl.pro +179 -0
- data/platform/symbian/qtscroller/include/QtScrollEvent +5 -0
- data/platform/symbian/qtscroller/include/QtScrollPrepareEvent +5 -0
- data/platform/symbian/qtscroller/include/QtScroller +5 -0
- data/platform/symbian/qtscroller/include/QtScrollerProperties +5 -0
- data/platform/symbian/qtscroller/qtscroller.pri +13 -0
- data/platform/symbian/qtscroller/qtscroller.pro +3 -0
- data/platform/symbian/qtscroller/src/qtflickgesture.cpp +696 -0
- data/platform/symbian/qtscroller/src/qtflickgesture_p.h +107 -0
- data/platform/symbian/qtscroller/src/qtscroller.cpp +2081 -0
- data/platform/symbian/qtscroller/src/qtscroller.h +138 -0
- data/platform/symbian/qtscroller/src/qtscroller_p.h +206 -0
- data/platform/symbian/qtscroller/src/qtscrollerfilter.cpp +351 -0
- data/platform/symbian/qtscroller/src/qtscrollerfilter_p.h +111 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties.cpp +413 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties.h +135 -0
- data/platform/symbian/qtscroller/src/qtscrollerproperties_p.h +91 -0
- data/platform/symbian/qtscroller/src/qtscrollevent.cpp +191 -0
- data/platform/symbian/qtscroller/src/qtscrollevent.h +100 -0
- data/platform/symbian/qtscroller/src/qtscrollevent_p.h +33 -0
- data/platform/symbian/qtscroller/src/src.pro +24 -0
- data/platform/symbian/rhodes.pro +4 -0
- data/platform/symbian/rhodes.sln +72 -0
- data/platform/symbian/rhodes/deployment.pri +115 -0
- data/platform/symbian/rhodes/rhodes.pro +141 -0
- data/platform/symbian/rhodes/rhodes.vcproj +385 -0
- data/platform/symbian/rhodes/{inc → src}/ContactsConstants.h +0 -0
- data/platform/symbian/rhodes/src/RhoThreadImpl.cpp +19 -0
- data/platform/symbian/rhodes/src/phonebook/Phonebook.cpp +19 -19
- data/platform/symbian/rhodes/{inc → src}/phonebook/Phonebook.h +1 -1
- data/platform/symbian/rhodes/src/qkineticscroller.cpp +1245 -0
- data/platform/symbian/rhodes/src/qkineticscroller.h +165 -0
- data/platform/symbian/rhodes/src/qkineticscroller_p.h +168 -0
- data/platform/symbian/rhodes/src/qwebviewkineticscroller.cpp +347 -0
- data/platform/symbian/rhodes/src/qwebviewkineticscroller.h +89 -0
- data/platform/symbian/rhodes/src/qwebviewselectionsuppressor.h +113 -0
- data/platform/symbian/rhodes_win32.pro +4 -0
- data/platform/symbian/rholib/rholib.pro +108 -0
- data/platform/symbian/rholib/rholib.vcproj +1466 -0
- data/platform/symbian/rubylib/rubylib.pro +163 -0
- data/platform/symbian/rubylib/rubylib.vcproj +1166 -0
- data/platform/symbian/rubylib/src/symbian_stubs.c +45 -3
- data/platform/symbian/sqlite3/sqlite3.pro +38 -0
- data/platform/symbian/sqlite3/sqlite3.vcproj +254 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/mutex.cpp +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/os_symbian.cpp +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/os_symbian.h +0 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/sqlite3.c +1 -0
- data/platform/symbian/{SQLite60 → sqlite3}/src/sqlite3.h +0 -0
- data/platform/symbian/syncengine/syncengine.pro +64 -0
- data/platform/symbian/syncengine/syncengine.vcproj +842 -0
- data/platform/win32/RhoSimulator/RhoSimulator.exe +0 -0
- data/platform/win32/replaceicon/replaceicon.cpp +25 -2
- data/platform/win32/replaceicon/stdafx.cpp +25 -3
- data/platform/win32/replaceicon/stdafx.h +25 -4
- data/platform/win32/updateresstring/stdafx.cpp +25 -3
- data/platform/win32/updateresstring/stdafx.h +25 -4
- data/platform/win32/updateresstring/updateresstring.cpp +25 -2
- data/platform/wm/RhoLib/RhoLib.vcproj +38 -8
- data/platform/wm/build/wm.rake +92 -76
- data/platform/wm/rhodes.sln +139 -139
- data/platform/wm/rhodes/Alert.cpp +31 -5
- data/platform/wm/rhodes/Alert.h +27 -1
- data/platform/wm/rhodes/AppManager.cpp +26 -0
- data/platform/wm/rhodes/AppManager.h +26 -0
- data/platform/wm/rhodes/DateTimePicker.cpp +26 -0
- data/platform/wm/rhodes/DateTimePicker.h +30 -0
- data/platform/wm/rhodes/LogOptionsDlg.cpp +26 -0
- data/platform/wm/rhodes/LogOptionsDlg.h +26 -0
- data/platform/wm/rhodes/LogView.cpp +26 -2
- data/platform/wm/rhodes/LogView.h +25 -1
- data/platform/wm/rhodes/Macros.h +25 -1
- data/platform/wm/rhodes/MainWindow.cpp +37 -2
- data/platform/wm/rhodes/MainWindow.h +29 -2
- data/platform/wm/rhodes/MapView/Graphics.cpp +25 -1
- data/platform/wm/rhodes/MapView/Graphics.h +26 -0
- data/platform/wm/rhodes/MapView/MapViewManager.cpp +26 -0
- data/platform/wm/rhodes/MapView/MapViewManager.h +25 -0
- data/platform/wm/rhodes/MetaHandler.cpp +26 -0
- data/platform/wm/rhodes/MetaHandler.h +26 -0
- data/platform/wm/rhodes/OkCancelModalDialog.h +26 -0
- data/platform/wm/rhodes/OutlookApp.cpp +26 -0
- data/platform/wm/rhodes/OutlookApp.h +26 -0
- data/platform/wm/rhodes/RhoNativeViewManager.cpp +26 -0
- data/platform/wm/rhodes/RhoNativeViewManagerWM.h +25 -8
- data/platform/wm/rhodes/Rhodes.cpp +127 -24
- data/platform/wm/rhodes/RingtoneManager.cpp +26 -0
- data/platform/wm/rhodes/RingtoneManager.h +26 -0
- data/platform/wm/rhodes/SyncStatusDlg.cpp +26 -0
- data/platform/wm/rhodes/SyncStatusDlg.h +26 -0
- data/platform/wm/rhodes/Utils.cpp +26 -0
- data/platform/wm/rhodes/Utils.h +26 -0
- data/platform/wm/rhodes/Vibrate.cpp +30 -9
- data/platform/wm/rhodes/Vibrate.h +27 -2
- data/platform/wm/rhodes/bluetooth/Bluetooth.cpp +63 -4
- data/platform/wm/rhodes/bluetooth/Bluetooth.h +32 -1
- data/platform/wm/rhodes/camera/Camera.cpp +40 -6
- data/platform/wm/rhodes/camera/Camera.h +32 -1
- data/platform/wm/rhodes/memory_helper.cpp +26 -0
- data/platform/wm/rhodes/menubar.cpp +26 -0
- data/platform/wm/rhodes/menubar.h +26 -0
- data/platform/wm/rhodes/phonebook/NativeAddressBook.cpp +26 -0
- data/platform/wm/rhodes/phonebook/NativeAddressBook.h +26 -0
- data/platform/wm/rhodes/phonebook/phonebook.cpp +26 -8
- data/platform/wm/rhodes/phonebook/phonebook.h +26 -8
- data/platform/wm/rhodes/resource.h +1 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoClassFactory.h +26 -0
- data/platform/wm/rhodes/rho/common/RhoCryptImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoCryptImpl.h +26 -0
- data/platform/wm/rhodes/rho/common/RhoThreadImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/common/RhoThreadImpl.h +26 -0
- data/platform/wm/rhodes/rho/net/NetRequestImpl.cpp +30 -1
- data/platform/wm/rhodes/rho/net/NetRequestImpl.h +29 -0
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.cpp +26 -0
- data/platform/wm/rhodes/rho/rubyext/GeoLocationImpl.h +26 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.cpp +27 -1
- data/platform/wm/rhodes/rho/rubyext/NativeToolbar.h +26 -0
- data/platform/wm/rhodes/rho/rubyext/NativeToolbarExt.cpp +71 -7
- data/platform/wm/rhodes/rho/rubyext/SystemImpl.cpp +36 -4
- data/platform/wm/rhodes/rho/rubyext/WebView.cpp +48 -2
- data/platform/wm/rhodes/rho/rubyext/calendar.cpp +26 -0
- data/platform/wm/rhodes/rhodes.vcproj +2491 -579
- data/platform/wm/rhodes/signature/Signature.cpp +26 -0
- data/platform/wm/rhodes/signature/Signature.h +26 -0
- data/platform/wm/rhodes/simulator/MainWindowQt.cpp +852 -0
- data/platform/wm/rhodes/{emulator → simulator}/MainWindowQt.h +76 -11
- data/platform/wm/rhodes/simulator/NativeTabbarQt.cpp +91 -0
- data/platform/wm/rhodes/simulator/NativeTabbarQt.h +102 -0
- data/platform/wm/rhodes/simulator/NativeToolbarQt.cpp +82 -0
- data/platform/wm/rhodes/simulator/NativeToolbarQt.h +78 -0
- data/platform/wm/rhodes/stdafx.cpp +25 -16
- data/platform/wm/rhodes/stdafx.h +26 -4
- data/platform/wm/rubylib/rubylib.vcproj +94 -78
- data/platform/wm/sqlite3/sqlite3.vcproj +8 -8
- data/platform/wm/syncengine/syncengine.vcproj +33 -11
- data/platform/wm/tools/detool/LogServer.cpp +33 -3
- data/platform/wm/tools/detool/LogServer.h +29 -1
- data/platform/wm/tools/detool/detool.cpp +105 -14
- data/platform/wm/tools/detool/detool.h +26 -0
- data/platform/wm/tools/detool/detool.vcproj +243 -242
- data/platform/wm/tools/detool/stdafx.cpp +25 -3
- data/platform/wm/tools/detool/stdafx.h +26 -0
- data/platform/wm/tools/detool/targetver.h +26 -0
- data/platform/wm/tools/rhosetup/rhosetup.cpp +25 -2
- data/platform/wm/tools/rhosetup/stdafx.cpp +25 -3
- data/platform/wm/tools/rhosetup/stdafx.h +25 -4
- data/platform/wp7/IronRuby/bin/Silverlight3Release/IronRuby.Libraries.dll +0 -0
- data/platform/wp7/IronRuby/bin/Silverlight3Release/IronRuby.dll +0 -0
- data/platform/wp7/RhoAppRunner/Program.cs +27 -1
- data/platform/wp7/RhoLogServer/Program.cs +27 -1
- data/platform/wp7/RhoLogServer/SocketServer.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoAsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoConfig.cs +84 -0
- data/platform/wp7/RhoRubyExtGen/RhoDatabase.cs +27 -1
- data/platform/wp7/RhoRubyExtGen/RhoJSON.cs +26 -0
- data/platform/wp7/RhoRubyExtGen/RhoNativeBar.cs +35 -3
- data/platform/wp7/RhoRubyExtGen/RhoRubyExtGen.csproj +2 -0
- data/platform/wp7/RhoRubyExtGen/RhoSyncEngine.cs +34 -2
- data/platform/wp7/RhoRubyExtGen/RhoSystem.cs +144 -0
- data/platform/wp7/RhoRubyExtGen/RhoWebView.cs +33 -2
- data/platform/wp7/RhoRubyLib/Initializers.Generated.cs +149 -5
- data/platform/wp7/RhoRubyLib/RhoAppAdapter.cs +27 -1
- data/platform/wp7/RhoRubyLib/RhoRuby.cs +27 -1
- data/platform/wp7/RhoRubyLib/RhoRubyLib.csproj +24 -1
- data/platform/wp7/RhoRubyLib/WP_PlatformAdaptationLayer.cs +26 -15
- data/platform/wp7/RhoRubyLib/common/IInputStream.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/Mutex.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoConf.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoEmptyProfiler.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoFile.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoFilePath.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoParamArray.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoParams.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoProfiler.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoResourceMap.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoStd.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhoThread.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/RhodesApp.cs +232 -16
- data/platform/wp7/RhoRubyLib/common/ThreadQueue.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/TimeInterval.cs +27 -1
- data/platform/wp7/RhoRubyLib/common/Tokenizer.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/DBAdapter.cs +33 -1
- data/platform/wp7/RhoRubyLib/db/DBAttrManager.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/DBCommand.cs +428 -0
- data/platform/wp7/RhoRubyLib/db/DBException.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBCallback.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/IDBStorage.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteCopyResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteResult.cs +27 -1
- data/platform/wp7/RhoRubyLib/db/SqliteStorage.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONArrayIterator.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONEntry.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JSONStructIterator.cs +27 -1
- data/platform/wp7/RhoRubyLib/json/JsonParser.cs +26 -0
- data/platform/wp7/RhoRubyLib/json/RJSONTokener.cs +26 -0
- data/platform/wp7/RhoRubyLib/logging/IRhoLogSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoEmptyLogger.cs +26 -0
- data/platform/wp7/RhoRubyLib/logging/RhoLogConf.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogFileSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogServerSink.cs +27 -1
- data/platform/wp7/RhoRubyLib/logging/RhoLogger.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/AsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/HttpServer.cs +28 -2
- data/platform/wp7/RhoRubyLib/net/NetRequest.cs +28 -2
- data/platform/wp7/RhoRubyLib/net/NetResponse.cs +27 -1
- data/platform/wp7/RhoRubyLib/net/URI.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoAsyncHttp.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoConfig.cs +188 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoDatabase.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoJSON.cs +26 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoKernelOps.cs +27 -1
- data/platform/wp7/RhoRubyLib/rubyext/RhoNativeBar.cs +130 -6
- data/platform/wp7/RhoRubyLib/rubyext/RhoSyncEngine.cs +42 -2
- data/platform/wp7/RhoRubyLib/rubyext/RhoSystem.cs +153 -0
- data/platform/wp7/RhoRubyLib/rubyext/RhoWebView.cs +49 -4
- data/platform/wp7/RhoRubyLib/sync/SyncSource.cs +17 -17
- data/platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml +18 -0
- data/platform/wp7/RhoRubyLib/views/RhoTabHeader.xaml.cs +56 -0
- data/platform/wp7/RhoRubyLib/views/RhoView.xaml +16 -0
- data/platform/wp7/RhoRubyLib/views/RhoView.xaml.cs +153 -0
- data/platform/wp7/build/wp.rake +31 -0
- data/platform/wp7/rhodes/App.xaml.cs +28 -2
- data/platform/wp7/rhodes/MainPage.xaml +4 -3
- data/platform/wp7/rhodes/MainPage.xaml.cs +50 -11
- data/platform/wp7/sqlite3/SQLiteClient.cs +27 -1
- data/rakefile.rb +200 -18
- data/res/build-tools/detool.exe +0 -0
- data/res/generators/rhogen.rb +2 -1
- data/res/generators/templates/application/app/Settings/home.bb.erb +14 -13
- data/res/generators/templates/application/app/Settings/home.erb +16 -17
- data/res/generators/templates/application/app/Settings/index.bb.erb +26 -27
- data/res/generators/templates/application/app/Settings/index.erb +28 -27
- data/res/generators/templates/application/app/Settings/login.bb.erb +25 -31
- data/res/generators/templates/application/app/Settings/login.erb +20 -22
- data/res/generators/templates/application/app/Settings/reset.bb.erb +12 -11
- data/res/generators/templates/application/app/Settings/reset.erb +10 -13
- data/res/generators/templates/application/app/Settings/wait.bb.erb +9 -2
- data/res/generators/templates/application/app/Settings/wait.erb +9 -4
- data/res/generators/templates/application/app/index.erb +17 -24
- data/res/generators/templates/application/app/layout.erb +51 -21
- data/res/generators/templates/application/build.yml +3 -1
- data/res/generators/templates/application/icon/icon.svg +5334 -0
- data/res/generators/templates/application/public/css/android.css +6 -1
- data/res/generators/templates/application/public/css/blackberry.css +6 -1
- data/res/generators/templates/application/public/css/iphone.css +4 -0
- data/res/generators/templates/application/public/jqmobile/images/ajax-loader.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icon-search-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-18-white.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-black.png +0 -0
- data/res/generators/templates/application/public/jqmobile/images/icons-36-white.png +0 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.css +1661 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.js +5626 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.min.css +8 -0
- data/res/generators/templates/application/public/jqmobile/jquery.mobile-1.0b1.min.js +146 -0
- data/res/generators/templates/application/public/{jqtouch/jqtouch-iphone.css → jqmobile/jquery.mobile.iphone.css} +1 -1
- data/res/generators/templates/application/public/jquery/jquery-1.6.2.js +8981 -0
- data/res/generators/templates/application/public/jquery/jquery-1.6.2.min.js +18 -0
- data/res/generators/templates/application/public/js/jqmobile-patch.js +231 -0
- data/res/generators/templates/model/controller.rb +3 -2
- data/res/generators/templates/model/edit.bb.erb +17 -17
- data/res/generators/templates/model/edit.erb +15 -20
- data/res/generators/templates/model/index.bb.erb +19 -19
- data/res/generators/templates/model/index.erb +23 -26
- data/res/generators/templates/model/new.bb.erb +18 -19
- data/res/generators/templates/model/new.erb +17 -19
- data/res/generators/templates/model/show.bb.erb +10 -11
- data/res/generators/templates/model/show.erb +16 -19
- data/rhobuild.yml.example +2 -1
- data/rhodes.gemspec +4 -3
- data/rhomobile-debug.gemspec +22 -0
- data/spec/framework_spec/app/layout.erb +1 -1
- data/spec/perfomance_spec/app/layout.erb +1 -1
- data/spec/phone_spec/app/spec/asynchttp_spec.rb +1 -1
- data/spec/phone_spec/app/spec/mapview_spec.rb +43 -0
- data/spec/phone_spec/app/spec/rho_spec.rb +23 -0
- data/spec/phone_spec/app/spec/syncengine_spec.rb +49 -8
- metadata +244 -344
- data/Manifest.txt +0 -6409
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/COPYING +0 -27
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/README +0 -95
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar.h +0 -1415
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Decoder.h +0 -201
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Exception.h +0 -187
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Image.h +0 -321
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ImageScanner.h +0 -130
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Processor.h +0 -223
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/QZBar.h +0 -169
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/QZBarImage.h +0 -72
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Scanner.h +0 -162
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Symbol.h +0 -529
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Video.h +0 -170
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/Window.h +0 -136
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarCaptureReader.h +0 -99
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarImage.h +0 -69
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarImageScanner.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderController.h +0 -142
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderView.h +0 -119
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarReaderViewController.h +0 -99
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/ZBarSymbol.h +0 -67
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/include/zbar/zbargtk.h +0 -205
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/config.c +0 -157
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/convert.c +0 -1172
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/debug.h +0 -87
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder.c +0 -409
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder.h +0 -219
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code128.c +0 -528
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code128.h +0 -49
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code39.c +0 -335
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/code39.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/ean.c +0 -660
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/ean.h +0 -86
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/i25.c +0 -243
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/i25.h +0 -50
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417.c +0 -223
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417.h +0 -49
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/pdf417_hash.h +0 -545
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/qr_finder.c +0 -102
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/decoder/qr_finder.h +0 -23
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/error.c +0 -183
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/error.h +0 -240
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/event.h +0 -62
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/image.c +0 -358
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/image.h +0 -142
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/img_scanner.c +0 -819
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/img_scanner.h +0 -38
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/jpeg.c +0 -241
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/mutex.h +0 -160
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor.c +0 -700
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor.h +0 -126
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/lock.c +0 -227
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/null.c +0 -62
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/posix.c +0 -337
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/posix.h +0 -138
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/win.c +0 -335
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/processor/x.c +0 -269
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode.h +0 -66
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/bch15_5.c +0 -184
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/bch15_5.h +0 -20
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/binarize.c +0 -639
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/binarize.h +0 -17
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/isaac.c +0 -139
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/isaac.h +0 -41
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdec.c +0 -3957
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdec.h +0 -168
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/qrdectxt.c +0 -405
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/rs.c +0 -799
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/rs.h +0 -66
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/util.c +0 -140
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/qrcode/util.h +0 -48
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/refcnt.c +0 -48
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/refcnt.h +0 -96
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/scanner.c +0 -317
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/svg.c +0 -184
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/svg.h +0 -65
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/symbol.c +0 -325
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/symbol.h +0 -93
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/thread.h +0 -127
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/timer.h +0 -151
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/unistd.h +0 -1
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video.c +0 -384
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video.h +0 -160
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/null.c +0 -37
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/v4l1.c +0 -435
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/v4l2.c +0 -509
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/video/vfw.c +0 -494
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window.c +0 -318
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window.h +0 -144
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/dib.c +0 -75
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/null.c +0 -103
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/vfw.c +0 -104
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/win.c +0 -334
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/win.h +0 -46
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/x.c +0 -356
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/x.h +0 -74
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/ximage.c +0 -219
- data/lib/extensions/barcode/ext/barcode/shared/zbar/zbar/zbar/window/xv.c +0 -273
- data/platform/android/Rhodes/jni/include/rhodes/jni/com_rhomobile_rhodes_SplashScreen.h +0 -39
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java +0 -222
- data/platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java +0 -185
- data/platform/shared/SyncClient/RhoError.h +0 -29
- data/platform/shared/SyncClient/SyncClient.h +0 -95
- data/platform/symbian/RhoLib/group/RhoLib.mmp +0 -41
- data/platform/symbian/RhoLib/group/bld.inf +0 -15
- data/platform/symbian/SQLite60/group/SQLite60.mmp +0 -21
- data/platform/symbian/SQLite60/group/bld.inf +0 -7
- data/platform/symbian/build/build.properties +0 -80
- data/platform/symbian/build/build.xml +0 -649
- data/platform/symbian/build/insertRhoBundle2pkg.rb +0 -26
- data/platform/symbian/build/lib/stlport.zip +0 -0
- data/platform/symbian/build/logfile.template +0 -1
- data/platform/symbian/build/release.properties +0 -7
- data/platform/symbian/lib/pips_nokia_1_3_ss.sis +0 -0
- data/platform/symbian/rhodes/data/loading.html +0 -11
- data/platform/symbian/rhodes/data/rhodes.rls +0 -91
- data/platform/symbian/rhodes/data/rhodes.rss +0 -537
- data/platform/symbian/rhodes/data/rhodes_reg.rss +0 -40
- data/platform/symbian/rhodes/gfx/qgn_menu_rhodes.svg +0 -55
- data/platform/symbian/rhodes/group/Icons_scalable_dc.mk +0 -50
- data/platform/symbian/rhodes/group/bld.inf +0 -10
- data/platform/symbian/rhodes/group/rhodes.mmp +0 -180
- data/platform/symbian/rhodes/help/Custom.xml +0 -18
- data/platform/symbian/rhodes/help/build_help.mk +0 -45
- data/platform/symbian/rhodes/help/rhodes.cshlp +0 -19
- data/platform/symbian/rhodes/help/rhodes.xml +0 -13
- data/platform/symbian/rhodes/inc/AppManager.h +0 -89
- data/platform/symbian/rhodes/inc/AppSoftkeysObserver.h +0 -95
- data/platform/symbian/rhodes/inc/ConnectionManager.h +0 -115
- data/platform/symbian/rhodes/inc/GeoLocationService.h +0 -89
- data/platform/symbian/rhodes/inc/HttpClient.h +0 -161
- data/platform/symbian/rhodes/inc/HttpConstants.h +0 -72
- data/platform/symbian/rhodes/inc/HttpEventHandler.h +0 -130
- data/platform/symbian/rhodes/inc/HttpFileManager.h +0 -116
- data/platform/symbian/rhodes/inc/HttpServer.h +0 -119
- data/platform/symbian/rhodes/inc/LogOptionsDialog.h +0 -59
- data/platform/symbian/rhodes/inc/RhoCamera.h +0 -321
- data/platform/symbian/rhodes/inc/SpecialLoadObserver.h +0 -115
- data/platform/symbian/rhodes/inc/SyncEngineWrap.h +0 -107
- data/platform/symbian/rhodes/inc/geolocation/GeoLocation.h +0 -91
- data/platform/symbian/rhodes/inc/ports_mngt.h +0 -23
- data/platform/symbian/rhodes/inc/posix_http_client.h +0 -37
- data/platform/symbian/rhodes/inc/rhodes.hrh +0 -106
- data/platform/symbian/rhodes/inc/rhodes.pan +0 -42
- data/platform/symbian/rhodes/inc/rhodesAppUi.h +0 -153
- data/platform/symbian/rhodes/inc/rhodesAppView.h +0 -242
- data/platform/symbian/rhodes/inc/rhodesApplication.h +0 -69
- data/platform/symbian/rhodes/inc/rhodesDocument.h +0 -103
- data/platform/symbian/rhodes/sis/backup_registration.xml +0 -5
- data/platform/symbian/rhodes/sis/cert/rhodes_cert.cer +0 -27
- data/platform/symbian/rhodes/sis/cert/rhodes_pid.key +0 -23
- data/platform/symbian/rhodes/sis/rhodes.pkg +0 -42
- data/platform/symbian/rhodes/src/AppManager.cpp +0 -153
- data/platform/symbian/rhodes/src/AppSoftkeysObserver.cpp +0 -88
- data/platform/symbian/rhodes/src/ConnectionManager.cpp +0 -337
- data/platform/symbian/rhodes/src/GeoLocationService.cpp +0 -151
- data/platform/symbian/rhodes/src/HttpClient.cpp +0 -489
- data/platform/symbian/rhodes/src/HttpConstants.cpp +0 -35
- data/platform/symbian/rhodes/src/HttpEventHandler.cpp +0 -587
- data/platform/symbian/rhodes/src/HttpFileManager.cpp +0 -282
- data/platform/symbian/rhodes/src/HttpServer.cpp +0 -275
- data/platform/symbian/rhodes/src/LogOptionsDialog.cpp +0 -179
- data/platform/symbian/rhodes/src/RhoCamera.cpp +0 -675
- data/platform/symbian/rhodes/src/SpecialLoadObserver.cpp +0 -95
- data/platform/symbian/rhodes/src/SyncEngineWrap.cpp +0 -400
- data/platform/symbian/rhodes/src/camera/camera.cpp +0 -23
- data/platform/symbian/rhodes/src/geolocation/GeoLocation.cpp +0 -110
- data/platform/symbian/rhodes/src/geolocation/ruby_geolocation.cpp +0 -38
- data/platform/symbian/rhodes/src/notification.cpp +0 -117
- data/platform/symbian/rhodes/src/ports_mngt.c +0 -103
- data/platform/symbian/rhodes/src/posix_http_client.c +0 -460
- data/platform/symbian/rhodes/src/rhodes.cpp +0 -43
- data/platform/symbian/rhodes/src/rhodesAppUi.cpp +0 -436
- data/platform/symbian/rhodes/src/rhodesAppView.cpp +0 -851
- data/platform/symbian/rhodes/src/rhodesApplication.cpp +0 -51
- data/platform/symbian/rhodes/src/rhodesDocument.cpp +0 -97
- data/platform/symbian/rhodes/src/rsyncengine.c +0 -11
- data/platform/symbian/rhodes/src/webview/webview.cpp +0 -44
- data/platform/symbian/rubylib/group/bld.inf +0 -7
- data/platform/symbian/rubylib/group/rubylib.mmp +0 -143
- data/platform/symbian/shttpd/group/bld.inf +0 -5
- data/platform/symbian/shttpd/group/shttpd.mmp +0 -24
- data/platform/symbian/tcmalloc/group/bld.inf +0 -15
- data/platform/symbian/tcmalloc/group/tcmalloc.mmp +0 -31
- data/platform/wm/rhodes/emulator/ExternalWebView.cpp +0 -20
- data/platform/wm/rhodes/emulator/ExternalWebView.h +0 -23
- data/platform/wm/rhodes/emulator/MainWindowCallback.h +0 -19
- data/platform/wm/rhodes/emulator/MainWindowProxy.cpp +0 -270
- data/platform/wm/rhodes/emulator/MainWindowProxy.h +0 -34
- data/platform/wm/rhodes/emulator/MainWindowQt.cpp +0 -356
- data/platform/wm/rhodes/emulator/NativeToolbarQt.cpp +0 -57
- data/platform/wm/rhodes/emulator/NativeToolbarQt.h +0 -52
- data/platform/wm/rhodes/emulator/QtMainWindow.cpp +0 -252
- data/platform/wm/rhodes/emulator/QtMainWindow.h +0 -62
- data/platform/wm/rhodes/rho/rubyext/NativeToolbarExt.h +0 -6
- data/platform/wp7/WPApplication.sln +0 -50
- data/platform/wp7/WPApplication/App.xaml +0 -19
- data/platform/wp7/WPApplication/App.xaml.cs +0 -211
- data/platform/wp7/WPApplication/ApplicationIcon.png +0 -0
- data/platform/wp7/WPApplication/Background.png +0 -0
- data/platform/wp7/WPApplication/MainPage.xaml +0 -44
- data/platform/wp7/WPApplication/MainPage.xaml.cs +0 -132
- data/platform/wp7/WPApplication/Properties/AppManifest.xml +0 -6
- data/platform/wp7/WPApplication/Properties/AssemblyInfo.cs +0 -35
- data/platform/wp7/WPApplication/Properties/WMAppManifest.xml +0 -32
- data/platform/wp7/WPApplication/SplashScreenImage.jpg +0 -0
- data/platform/wp7/WPApplication/WPApplication.csproj +0 -201
- data/platform/wp7/WPApplication/WP_PlatformAdaptationLayer.cs +0 -88
- data/platform/wp7/WPApplication/app_manifest.txt +0 -1
- data/platform/wp7/WPApplication/readme.htm +0 -40
- data/platform/wp7/WPApplication/readme2.htm +0 -37
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.bb.erb +0 -29
- data/platform/wp7/WPApplication/rho/apps/app/Model1/edit.erb +0 -32
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.bb.erb +0 -21
- data/platform/wp7/WPApplication/rho/apps/app/Model1/index.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1.rb +0 -10
- data/platform/wp7/WPApplication/rho/apps/app/Model1/model1_controller.rb +0 -58
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.bb.erb +0 -29
- data/platform/wp7/WPApplication/rho/apps/app/Model1/new.erb +0 -31
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.bb.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/Model1/show.erb +0 -28
- data/platform/wp7/WPApplication/rho/apps/app/Settings/controller.rb +0 -75
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.bb.erb +0 -17
- data/platform/wp7/WPApplication/rho/apps/app/Settings/home.erb +0 -20
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.bb.erb +0 -32
- data/platform/wp7/WPApplication/rho/apps/app/Settings/index.erb +0 -30
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.bb.erb +0 -35
- data/platform/wp7/WPApplication/rho/apps/app/Settings/login.erb +0 -27
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.bb.erb +0 -15
- data/platform/wp7/WPApplication/rho/apps/app/Settings/reset.erb +0 -17
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.bb.erb +0 -3
- data/platform/wp7/WPApplication/rho/apps/app/Settings/wait.erb +0 -5
- data/platform/wp7/WPApplication/rho/apps/app/application.rb +0 -16
- data/platform/wp7/WPApplication/rho/apps/app/helpers/application_helper.rb +0 -126
- data/platform/wp7/WPApplication/rho/apps/app/helpers/browser_helper.rb +0 -18
- data/platform/wp7/WPApplication/rho/apps/app/index.bb.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/index.erb +0 -26
- data/platform/wp7/WPApplication/rho/apps/app/layout.erb +0 -47
- data/platform/wp7/WPApplication/rho/apps/app/loading.html +0 -11
- data/platform/wp7/WPApplication/rho/apps/app_manifest.txt +0 -1
- data/platform/wp7/WPApplication/rho/apps/public/css/android.css +0 -330
- data/platform/wp7/WPApplication/rho/apps/public/css/blackberry.css +0 -115
- data/platform/wp7/WPApplication/rho/apps/public/css/iphone.css +0 -410
- data/platform/wp7/WPApplication/rho/apps/public/css/windows_mobile.css +0 -222
- data/platform/wp7/WPApplication/rho/apps/public/images/IUI_LICENSE.txt +0 -21
- data/platform/wp7/WPApplication/rho/apps/public/images/android/ic_menu_more.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/disclosure_detail.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/backButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/blueButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/cancel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/chevron.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/grayButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/on_off.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/jqtouch/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/radiobutton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/select.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iphone/switch.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/iui-logo-touch-icon.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrow.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowDown.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listArrowSel.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/listGroup.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/loading.gif +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/pinstripes.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/right_button.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/selection.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/thumb.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggle.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toggleOn.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolButton_new.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/toolbar.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/images/whiteButton.png +0 -0
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch-iphone.css +0 -9
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.css +0 -374
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.js +0 -742
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jqtouch.transitions.js +0 -60
- data/platform/wp7/WPApplication/rho/apps/public/jqtouch/jquery.1.3.2.min.js +0 -19
- data/platform/wp7/WPApplication/rho/apps/public/js/application.js +0 -1
- data/platform/wp7/WPApplication/rho/apps/public/js/rho.js +0 -4
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation-wm.js +0 -59
- data/platform/wp7/WPApplication/rho/apps/public/js/rhogeolocation.js +0 -11
- data/platform/wp7/WPApplication/rho/apps/rhoconfig.txt +0 -32
- data/platform/wp7/WPApplication/rhoconfig.txt +0 -32
- data/platform/wp7/WPApplication/windows_mobile.css +0 -222
- data/res/generators/templates/application/public/jqtouch/changes.txt +0 -20
- data/res/generators/templates/application/public/jqtouch/jqtouch.css +0 -374
- data/res/generators/templates/application/public/jqtouch/jqtouch.js +0 -771
- data/res/generators/templates/application/public/jqtouch/jqtouch.transitions.js +0 -60
- data/res/generators/templates/application/public/jqtouch/jquery.1.3.2.min.js +0 -19
- data/res/generators/templates/application/public/js/wp7.js +0 -7
@@ -1,205 +0,0 @@
|
|
1
|
-
/*------------------------------------------------------------------------
|
2
|
-
* Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
|
3
|
-
*
|
4
|
-
* This file is part of the ZBar Bar Code Reader.
|
5
|
-
*
|
6
|
-
* The ZBar Bar Code Reader is free software; you can redistribute it
|
7
|
-
* and/or modify it under the terms of the GNU Lesser Public License as
|
8
|
-
* published by the Free Software Foundation; either version 2.1 of
|
9
|
-
* the License, or (at your option) any later version.
|
10
|
-
*
|
11
|
-
* The ZBar Bar Code Reader is distributed in the hope that it will be
|
12
|
-
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
13
|
-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
-
* GNU Lesser Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser Public License
|
17
|
-
* along with the ZBar Bar Code Reader; if not, write to the Free
|
18
|
-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
19
|
-
* Boston, MA 02110-1301 USA
|
20
|
-
*
|
21
|
-
* http://sourceforge.net/projects/zbar
|
22
|
-
*------------------------------------------------------------------------*/
|
23
|
-
#ifndef __ZBAR_GTK_H__
|
24
|
-
#define __ZBAR_GTK_H__
|
25
|
-
|
26
|
-
/** SECTION:ZBarGtk
|
27
|
-
* @short_description: barcode reader GTK+ 2.x widget
|
28
|
-
* @include: zbar/zbargtk.h
|
29
|
-
*
|
30
|
-
* embeds a barcode reader directly into a GTK+ based GUI. the widget
|
31
|
-
* can process barcodes from a video source (using the
|
32
|
-
* #ZBarGtk:video-device and #ZBarGtk:video-enabled properties) or
|
33
|
-
* from individual GdkPixbufs supplied to zbar_gtk_scan_image()
|
34
|
-
*
|
35
|
-
* Since: 1.5
|
36
|
-
*/
|
37
|
-
|
38
|
-
#include <glib.h>
|
39
|
-
#include <glib-object.h>
|
40
|
-
#include <gtk/gtktable.h>
|
41
|
-
|
42
|
-
#include <zbar.h>
|
43
|
-
|
44
|
-
G_BEGIN_DECLS
|
45
|
-
|
46
|
-
#define ZBAR_TYPE_GTK (zbar_gtk_get_type())
|
47
|
-
#define ZBAR_GTK(obj) \
|
48
|
-
(G_TYPE_CHECK_INSTANCE_CAST((obj), ZBAR_TYPE_GTK, ZBarGtk))
|
49
|
-
#define ZBAR_GTK_CLASS(klass) \
|
50
|
-
(G_TYPE_CHECK_CLASS_CAST((klass), ZBAR_TYPE_GTK, ZBarGtkClass))
|
51
|
-
#define ZBAR_IS_GTK(obj) \
|
52
|
-
(G_TYPE_CHECK_INSTANCE_TYPE((obj), ZBAR_TYPE_GTK))
|
53
|
-
#define ZBAR_IS_GTK_CLASS(klass) \
|
54
|
-
(G_TYPE_CHECK_CLASS_TYPE((klass), ZBAR_TYPE_GTK))
|
55
|
-
#define ZBAR_GTK_GET_CLASS(obj) \
|
56
|
-
(G_TYPE_INSTANCE_GET_CLASS((obj), ZBAR_TYPE_GTK, ZBarGtkClass))
|
57
|
-
|
58
|
-
typedef struct _ZBarGtk ZBarGtk;
|
59
|
-
typedef struct _ZBarGtkClass ZBarGtkClass;
|
60
|
-
|
61
|
-
struct _ZBarGtk {
|
62
|
-
GtkWidget widget;
|
63
|
-
gpointer *_private;
|
64
|
-
|
65
|
-
/* properties */
|
66
|
-
|
67
|
-
/**
|
68
|
-
* ZBarGtk:video-device:
|
69
|
-
*
|
70
|
-
* the currently set video device.
|
71
|
-
*
|
72
|
-
* setting a new device opens it and automatically sets
|
73
|
-
* #ZBarGtk:video-enabled. set the empty string ("") or NULL to
|
74
|
-
* close.
|
75
|
-
*/
|
76
|
-
|
77
|
-
/**
|
78
|
-
* ZBarGtk:video-enabled:
|
79
|
-
*
|
80
|
-
* video device streaming state.
|
81
|
-
*
|
82
|
-
* use to pause/resume video scanning.
|
83
|
-
*/
|
84
|
-
|
85
|
-
/**
|
86
|
-
* ZBarGtk:video-opened:
|
87
|
-
*
|
88
|
-
* video device opened state.
|
89
|
-
*
|
90
|
-
* (re)setting #ZBarGtk:video-device should eventually cause it
|
91
|
-
* to be opened or closed. any errors while streaming/scanning
|
92
|
-
* will also cause the device to be closed
|
93
|
-
*/
|
94
|
-
};
|
95
|
-
|
96
|
-
struct _ZBarGtkClass {
|
97
|
-
GtkWidgetClass parent_class;
|
98
|
-
|
99
|
-
/* signals */
|
100
|
-
|
101
|
-
/**
|
102
|
-
* ZBarGtk::decoded:
|
103
|
-
* @widget: the object that received the signal
|
104
|
-
* @symbol_type: the type of symbol decoded (a zbar_symbol_type_t)
|
105
|
-
* @data: the data decoded from the symbol
|
106
|
-
*
|
107
|
-
* emitted when a barcode is decoded from an image.
|
108
|
-
* the symbol type and contained data are provided as separate
|
109
|
-
* parameters
|
110
|
-
*/
|
111
|
-
void (*decoded) (ZBarGtk *zbar,
|
112
|
-
zbar_symbol_type_t symbol_type,
|
113
|
-
const char *data);
|
114
|
-
|
115
|
-
/**
|
116
|
-
* ZBarGtk::decoded-text:
|
117
|
-
* @widget: the object that received the signal
|
118
|
-
* @text: the decoded data prefixed by the string name of the
|
119
|
-
* symbol type (separated by a colon)
|
120
|
-
*
|
121
|
-
* emitted when a barcode is decoded from an image.
|
122
|
-
* the symbol type name is prefixed to the data, separated by a
|
123
|
-
* colon
|
124
|
-
*/
|
125
|
-
void (*decoded_text) (ZBarGtk *zbar,
|
126
|
-
const char *text);
|
127
|
-
|
128
|
-
/**
|
129
|
-
* ZBarGtk::scan-image:
|
130
|
-
* @widget: the object that received the signal
|
131
|
-
* @image: the image to scan for barcodes
|
132
|
-
*/
|
133
|
-
void (*scan_image) (ZBarGtk *zbar,
|
134
|
-
GdkPixbuf *image);
|
135
|
-
};
|
136
|
-
|
137
|
-
GType zbar_gtk_get_type(void) G_GNUC_CONST;
|
138
|
-
|
139
|
-
/**
|
140
|
-
* zbar_gtk_new:
|
141
|
-
* create a new barcode reader widget instance.
|
142
|
-
* initially has no associated video device or image.
|
143
|
-
*
|
144
|
-
* Returns: a new #ZBarGtk widget instance
|
145
|
-
*/
|
146
|
-
GtkWidget *zbar_gtk_new(void);
|
147
|
-
|
148
|
-
/**
|
149
|
-
* zbar_gtk_scan_image:
|
150
|
-
*
|
151
|
-
*/
|
152
|
-
void zbar_gtk_scan_image(ZBarGtk *zbar,
|
153
|
-
GdkPixbuf *image);
|
154
|
-
|
155
|
-
/** retrieve the currently opened video device.
|
156
|
-
*
|
157
|
-
* Returns: the current video device or NULL if no device is opened
|
158
|
-
*/
|
159
|
-
const char *zbar_gtk_get_video_device(ZBarGtk *zbar);
|
160
|
-
|
161
|
-
/** open a new video device.
|
162
|
-
*
|
163
|
-
* @video_device: the platform specific name of the device to open.
|
164
|
-
* use NULL to close a currently opened device.
|
165
|
-
*
|
166
|
-
* @note since opening a device may take some time, this call will
|
167
|
-
* return immediately and the device will be opened asynchronously
|
168
|
-
*/
|
169
|
-
void zbar_gtk_set_video_device(ZBarGtk *zbar,
|
170
|
-
const char *video_device);
|
171
|
-
|
172
|
-
/** retrieve the current video enabled state.
|
173
|
-
*
|
174
|
-
* Returns: true if video scanning is currently enabled, false otherwise
|
175
|
-
*/
|
176
|
-
gboolean zbar_gtk_get_video_enabled(ZBarGtk *zbar);
|
177
|
-
|
178
|
-
/** enable/disable video scanning.
|
179
|
-
* @video_enabled: true to enable video scanning, false to disable
|
180
|
-
*
|
181
|
-
* has no effect unless a video device is opened
|
182
|
-
*/
|
183
|
-
void zbar_gtk_set_video_enabled(ZBarGtk *zbar,
|
184
|
-
gboolean video_enabled);
|
185
|
-
|
186
|
-
/** retrieve the current video opened state.
|
187
|
-
*
|
188
|
-
* Returns: true if video device is currently opened, false otherwise
|
189
|
-
*/
|
190
|
-
gboolean zbar_gtk_get_video_opened(ZBarGtk *zbar);
|
191
|
-
|
192
|
-
/**
|
193
|
-
* utility function to populate a zbar_image_t from a GdkPixbuf.
|
194
|
-
* @image: the zbar library image destination to populate
|
195
|
-
* @pixbuf: the GdkPixbuf source
|
196
|
-
*
|
197
|
-
* Returns: TRUE if successful or FALSE if the conversion could not be
|
198
|
-
* performed for some reason
|
199
|
-
*/
|
200
|
-
gboolean zbar_gtk_image_from_pixbuf(zbar_image_t *image,
|
201
|
-
GdkPixbuf *pixbuf);
|
202
|
-
|
203
|
-
G_END_DECLS
|
204
|
-
|
205
|
-
#endif
|
@@ -1,157 +0,0 @@
|
|
1
|
-
/*------------------------------------------------------------------------
|
2
|
-
* Copyright 2008-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
|
3
|
-
*
|
4
|
-
* This file is part of the ZBar Bar Code Reader.
|
5
|
-
*
|
6
|
-
* The ZBar Bar Code Reader is free software; you can redistribute it
|
7
|
-
* and/or modify it under the terms of the GNU Lesser Public License as
|
8
|
-
* published by the Free Software Foundation; either version 2.1 of
|
9
|
-
* the License, or (at your option) any later version.
|
10
|
-
*
|
11
|
-
* The ZBar Bar Code Reader is distributed in the hope that it will be
|
12
|
-
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
13
|
-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
-
* GNU Lesser Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser Public License
|
17
|
-
* along with the ZBar Bar Code Reader; if not, write to the Free
|
18
|
-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
19
|
-
* Boston, MA 02110-1301 USA
|
20
|
-
*
|
21
|
-
* http://sourceforge.net/projects/zbar
|
22
|
-
*------------------------------------------------------------------------*/
|
23
|
-
|
24
|
-
|
25
|
-
#include "../../config.h"
|
26
|
-
#include <stdlib.h> /* strtol */
|
27
|
-
#include <string.h> /* strchr, strncmp, strlen */
|
28
|
-
#ifdef HAVE_ERRNO_H
|
29
|
-
# include <errno.h>
|
30
|
-
#endif
|
31
|
-
|
32
|
-
#include "../include/zbar.h"
|
33
|
-
|
34
|
-
int zbar_parse_config (const char *cfgstr,
|
35
|
-
zbar_symbol_type_t *sym,
|
36
|
-
zbar_config_t *cfg,
|
37
|
-
int *val)
|
38
|
-
{
|
39
|
-
const char *dot, *eq;
|
40
|
-
int len;
|
41
|
-
char negate;
|
42
|
-
if(!cfgstr)
|
43
|
-
return(1);
|
44
|
-
|
45
|
-
dot = strchr(cfgstr, '.');
|
46
|
-
if(dot) {
|
47
|
-
int len = dot - cfgstr;
|
48
|
-
if(!len || (len == 1 && !strncmp(cfgstr, "*", len)))
|
49
|
-
*sym = 0;
|
50
|
-
else if(len < 2)
|
51
|
-
return(1);
|
52
|
-
else if(!strncmp(cfgstr, "qrcode", len))
|
53
|
-
*sym = ZBAR_QRCODE;
|
54
|
-
else if(len < 3)
|
55
|
-
return(1);
|
56
|
-
else if(!strncmp(cfgstr, "upca", len))
|
57
|
-
*sym = ZBAR_UPCA;
|
58
|
-
else if(!strncmp(cfgstr, "upce", len))
|
59
|
-
*sym = ZBAR_UPCE;
|
60
|
-
else if(!strncmp(cfgstr, "ean13", len))
|
61
|
-
*sym = ZBAR_EAN13;
|
62
|
-
else if(!strncmp(cfgstr, "ean8", len))
|
63
|
-
*sym = ZBAR_EAN8;
|
64
|
-
else if(!strncmp(cfgstr, "i25", len))
|
65
|
-
*sym = ZBAR_I25;
|
66
|
-
else if(len < 4)
|
67
|
-
return(1);
|
68
|
-
else if(!strncmp(cfgstr, "scanner", len))
|
69
|
-
*sym = ZBAR_PARTIAL; /* FIXME lame */
|
70
|
-
else if(!strncmp(cfgstr, "isbn13", len))
|
71
|
-
*sym = ZBAR_ISBN13;
|
72
|
-
else if(!strncmp(cfgstr, "isbn10", len))
|
73
|
-
*sym = ZBAR_ISBN10;
|
74
|
-
#if 0
|
75
|
-
/* FIXME addons are configured per-main symbol type */
|
76
|
-
else if(!strncmp(cfgstr, "addon2", len))
|
77
|
-
*sym = ZBAR_ADDON2;
|
78
|
-
else if(!strncmp(cfgstr, "addon5", len))
|
79
|
-
*sym = ZBAR_ADDON5;
|
80
|
-
#endif
|
81
|
-
else if(len < 6)
|
82
|
-
return(1);
|
83
|
-
else if(!strncmp(cfgstr, "code39", len))
|
84
|
-
*sym = ZBAR_CODE39;
|
85
|
-
else if(!strncmp(cfgstr, "pdf417", len))
|
86
|
-
*sym = ZBAR_PDF417;
|
87
|
-
else if(len < 7)
|
88
|
-
return(1);
|
89
|
-
else if(!strncmp(cfgstr, "code128", len))
|
90
|
-
*sym = ZBAR_CODE128;
|
91
|
-
else
|
92
|
-
return(1);
|
93
|
-
cfgstr = dot + 1;
|
94
|
-
}
|
95
|
-
else
|
96
|
-
*sym = 0;
|
97
|
-
|
98
|
-
len = strlen(cfgstr);
|
99
|
-
eq = strchr(cfgstr, '=');
|
100
|
-
if(eq)
|
101
|
-
len = eq - cfgstr;
|
102
|
-
else
|
103
|
-
*val = 1; /* handle this here so we can override later */
|
104
|
-
negate = 0;
|
105
|
-
|
106
|
-
if(len > 3 && !strncmp(cfgstr, "no-", 3)) {
|
107
|
-
negate = 1;
|
108
|
-
cfgstr += 3;
|
109
|
-
len -= 3;
|
110
|
-
}
|
111
|
-
|
112
|
-
if(len < 1)
|
113
|
-
return(1);
|
114
|
-
else if(!strncmp(cfgstr, "y-density", len))
|
115
|
-
*cfg = ZBAR_CFG_Y_DENSITY;
|
116
|
-
else if(!strncmp(cfgstr, "x-density", len))
|
117
|
-
*cfg = ZBAR_CFG_X_DENSITY;
|
118
|
-
else if(len < 2)
|
119
|
-
return(1);
|
120
|
-
else if(!strncmp(cfgstr, "enable", len))
|
121
|
-
*cfg = ZBAR_CFG_ENABLE;
|
122
|
-
else if(len < 3)
|
123
|
-
return(1);
|
124
|
-
else if(!strncmp(cfgstr, "disable", len)) {
|
125
|
-
*cfg = ZBAR_CFG_ENABLE;
|
126
|
-
negate = !negate; /* no-disable ?!? */
|
127
|
-
}
|
128
|
-
else if(!strncmp(cfgstr, "min-length", len))
|
129
|
-
*cfg = ZBAR_CFG_MIN_LEN;
|
130
|
-
else if(!strncmp(cfgstr, "max-length", len))
|
131
|
-
*cfg = ZBAR_CFG_MAX_LEN;
|
132
|
-
else if(!strncmp(cfgstr, "ascii", len))
|
133
|
-
*cfg = ZBAR_CFG_ASCII;
|
134
|
-
else if(!strncmp(cfgstr, "add-check", len))
|
135
|
-
*cfg = ZBAR_CFG_ADD_CHECK;
|
136
|
-
else if(!strncmp(cfgstr, "emit-check", len))
|
137
|
-
*cfg = ZBAR_CFG_EMIT_CHECK;
|
138
|
-
else if(!strncmp(cfgstr, "position", len))
|
139
|
-
*cfg = ZBAR_CFG_POSITION;
|
140
|
-
else
|
141
|
-
return(1);
|
142
|
-
|
143
|
-
if(eq) {
|
144
|
-
#ifdef HAVE_ERRNO_H
|
145
|
-
errno = 0;
|
146
|
-
#endif
|
147
|
-
*val = strtol(eq + 1, NULL, 0);
|
148
|
-
#ifdef HAVE_ERRNO_H
|
149
|
-
if(errno)
|
150
|
-
return(1);
|
151
|
-
#endif
|
152
|
-
}
|
153
|
-
if(negate)
|
154
|
-
*val = !*val;
|
155
|
-
|
156
|
-
return(0);
|
157
|
-
}
|
@@ -1,1172 +0,0 @@
|
|
1
|
-
/*------------------------------------------------------------------------
|
2
|
-
* Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
|
3
|
-
*
|
4
|
-
* This file is part of the ZBar Bar Code Reader.
|
5
|
-
*
|
6
|
-
* The ZBar Bar Code Reader is free software; you can redistribute it
|
7
|
-
* and/or modify it under the terms of the GNU Lesser Public License as
|
8
|
-
* published by the Free Software Foundation; either version 2.1 of
|
9
|
-
* the License, or (at your option) any later version.
|
10
|
-
*
|
11
|
-
* The ZBar Bar Code Reader is distributed in the hope that it will be
|
12
|
-
* useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
13
|
-
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
14
|
-
* GNU Lesser Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser Public License
|
17
|
-
* along with the ZBar Bar Code Reader; if not, write to the Free
|
18
|
-
* Software Foundation, Inc., 51 Franklin St, Fifth Floor,
|
19
|
-
* Boston, MA 02110-1301 USA
|
20
|
-
*
|
21
|
-
* http://sourceforge.net/projects/zbar
|
22
|
-
*------------------------------------------------------------------------*/
|
23
|
-
|
24
|
-
#include "image.h"
|
25
|
-
#include "video.h"
|
26
|
-
#include "window.h"
|
27
|
-
|
28
|
-
/* pack bit size and location offset of a component into one byte
|
29
|
-
*/
|
30
|
-
#define RGB_BITS(off, size) ((((8 - (size)) & 0x7) << 5) | ((off) & 0x1f))
|
31
|
-
|
32
|
-
typedef void (conversion_handler_t)(zbar_image_t*,
|
33
|
-
const zbar_format_def_t*,
|
34
|
-
const zbar_image_t*,
|
35
|
-
const zbar_format_def_t*);
|
36
|
-
|
37
|
-
typedef struct conversion_def_s {
|
38
|
-
int cost; /* conversion "badness" */
|
39
|
-
conversion_handler_t *func; /* function that accomplishes it */
|
40
|
-
} conversion_def_t;
|
41
|
-
|
42
|
-
|
43
|
-
/* NULL terminated list of known formats, in order of preference
|
44
|
-
* (NB Cr=V Cb=U)
|
45
|
-
*/
|
46
|
-
const uint32_t _zbar_formats[] = {
|
47
|
-
|
48
|
-
/* planar YUV formats */
|
49
|
-
fourcc('4','2','2','P'), /* FIXME also YV16? */
|
50
|
-
fourcc('I','4','2','0'),
|
51
|
-
fourcc('Y','U','1','2'), /* FIXME also IYUV? */
|
52
|
-
fourcc('Y','V','1','2'),
|
53
|
-
fourcc('4','1','1','P'),
|
54
|
-
|
55
|
-
/* planar Y + packed UV plane */
|
56
|
-
fourcc('N','V','1','2'),
|
57
|
-
fourcc('N','V','2','1'),
|
58
|
-
|
59
|
-
/* packed YUV formats */
|
60
|
-
fourcc('Y','U','Y','V'),
|
61
|
-
fourcc('U','Y','V','Y'),
|
62
|
-
fourcc('Y','U','Y','2'), /* FIXME add YVYU */
|
63
|
-
fourcc('Y','U','V','4'), /* FIXME where is this from? */
|
64
|
-
|
65
|
-
/* packed rgb formats */
|
66
|
-
fourcc('R','G','B','3'),
|
67
|
-
fourcc( 3 , 0 , 0 , 0 ),
|
68
|
-
fourcc('B','G','R','3'),
|
69
|
-
fourcc('R','G','B','4'),
|
70
|
-
fourcc('B','G','R','4'),
|
71
|
-
|
72
|
-
fourcc('R','G','B','P'),
|
73
|
-
fourcc('R','G','B','O'),
|
74
|
-
fourcc('R','G','B','R'),
|
75
|
-
fourcc('R','G','B','Q'),
|
76
|
-
|
77
|
-
fourcc('Y','U','V','9'),
|
78
|
-
fourcc('Y','V','U','9'),
|
79
|
-
|
80
|
-
/* basic grayscale format */
|
81
|
-
fourcc('G','R','E','Y'),
|
82
|
-
fourcc('Y','8','0','0'),
|
83
|
-
fourcc('Y','8',' ',' '),
|
84
|
-
fourcc('Y','8', 0 , 0 ),
|
85
|
-
|
86
|
-
/* low quality RGB formats */
|
87
|
-
fourcc('R','G','B','1'),
|
88
|
-
fourcc('R','4','4','4'),
|
89
|
-
fourcc('B','A','8','1'),
|
90
|
-
|
91
|
-
/* unsupported packed YUV formats */
|
92
|
-
fourcc('Y','4','1','P'),
|
93
|
-
fourcc('Y','4','4','4'),
|
94
|
-
fourcc('Y','U','V','O'),
|
95
|
-
fourcc('H','M','1','2'),
|
96
|
-
|
97
|
-
/* unsupported packed RGB format */
|
98
|
-
fourcc('H','I','2','4'),
|
99
|
-
|
100
|
-
/* unsupported compressed formats */
|
101
|
-
fourcc('J','P','E','G'),
|
102
|
-
fourcc('M','J','P','G'),
|
103
|
-
fourcc('M','P','E','G'),
|
104
|
-
|
105
|
-
/* terminator */
|
106
|
-
0
|
107
|
-
};
|
108
|
-
|
109
|
-
const int _zbar_num_formats = sizeof(_zbar_formats) / sizeof(uint32_t);
|
110
|
-
|
111
|
-
/* format definitions */
|
112
|
-
static const zbar_format_def_t format_defs[] = {
|
113
|
-
|
114
|
-
{ fourcc('R','G','B','4'), ZBAR_FMT_RGB_PACKED,
|
115
|
-
{ { 4, RGB_BITS(8, 8), RGB_BITS(16, 8), RGB_BITS(24, 8) } } },
|
116
|
-
{ fourcc('B','G','R','1'), ZBAR_FMT_RGB_PACKED,
|
117
|
-
{ { 1, RGB_BITS(0, 3), RGB_BITS(3, 3), RGB_BITS(6, 2) } } },
|
118
|
-
{ fourcc('4','2','2','P'), ZBAR_FMT_YUV_PLANAR, { { 1, 0, 0 /*UV*/ } } },
|
119
|
-
{ fourcc('Y','8','0','0'), ZBAR_FMT_GRAY, },
|
120
|
-
{ fourcc('Y','U','Y','2'), ZBAR_FMT_YUV_PACKED,
|
121
|
-
{ { 1, 0, 0, /*YUYV*/ } } },
|
122
|
-
{ fourcc('J','P','E','G'), ZBAR_FMT_JPEG, },
|
123
|
-
{ fourcc('Y','V','Y','U'), ZBAR_FMT_YUV_PACKED,
|
124
|
-
{ { 1, 0, 1, /*YVYU*/ } } },
|
125
|
-
{ fourcc('Y','8', 0 , 0 ), ZBAR_FMT_GRAY, },
|
126
|
-
{ fourcc('N','V','2','1'), ZBAR_FMT_YUV_NV, { { 1, 1, 1 /*VU*/ } } },
|
127
|
-
{ fourcc('N','V','1','2'), ZBAR_FMT_YUV_NV, { { 1, 1, 0 /*UV*/ } } },
|
128
|
-
{ fourcc('B','G','R','3'), ZBAR_FMT_RGB_PACKED,
|
129
|
-
{ { 3, RGB_BITS(16, 8), RGB_BITS(8, 8), RGB_BITS(0, 8) } } },
|
130
|
-
{ fourcc('Y','V','U','9'), ZBAR_FMT_YUV_PLANAR, { { 2, 2, 1 /*VU*/ } } },
|
131
|
-
{ fourcc('R','G','B','O'), ZBAR_FMT_RGB_PACKED,
|
132
|
-
{ { 2, RGB_BITS(10, 5), RGB_BITS(5, 5), RGB_BITS(0, 5) } } },
|
133
|
-
{ fourcc('R','G','B','Q'), ZBAR_FMT_RGB_PACKED,
|
134
|
-
{ { 2, RGB_BITS(2, 5), RGB_BITS(13, 5), RGB_BITS(8, 5) } } },
|
135
|
-
{ fourcc('G','R','E','Y'), ZBAR_FMT_GRAY, },
|
136
|
-
{ fourcc( 3 , 0 , 0 , 0 ), ZBAR_FMT_RGB_PACKED,
|
137
|
-
{ { 4, RGB_BITS(16, 8), RGB_BITS(8, 8), RGB_BITS(0, 8) } } },
|
138
|
-
{ fourcc('Y','8',' ',' '), ZBAR_FMT_GRAY, },
|
139
|
-
{ fourcc('I','4','2','0'), ZBAR_FMT_YUV_PLANAR, { { 1, 1, 0 /*UV*/ } } },
|
140
|
-
{ fourcc('R','G','B','1'), ZBAR_FMT_RGB_PACKED,
|
141
|
-
{ { 1, RGB_BITS(5, 3), RGB_BITS(2, 3), RGB_BITS(0, 2) } } },
|
142
|
-
{ fourcc('Y','U','1','2'), ZBAR_FMT_YUV_PLANAR, { { 1, 1, 0 /*UV*/ } } },
|
143
|
-
{ fourcc('Y','V','1','2'), ZBAR_FMT_YUV_PLANAR, { { 1, 1, 1 /*VU*/ } } },
|
144
|
-
{ fourcc('R','G','B','3'), ZBAR_FMT_RGB_PACKED,
|
145
|
-
{ { 3, RGB_BITS(0, 8), RGB_BITS(8, 8), RGB_BITS(16, 8) } } },
|
146
|
-
{ fourcc('R','4','4','4'), ZBAR_FMT_RGB_PACKED,
|
147
|
-
{ { 2, RGB_BITS(8, 4), RGB_BITS(4, 4), RGB_BITS(0, 4) } } },
|
148
|
-
{ fourcc('B','G','R','4'), ZBAR_FMT_RGB_PACKED,
|
149
|
-
{ { 4, RGB_BITS(16, 8), RGB_BITS(8, 8), RGB_BITS(0, 8) } } },
|
150
|
-
{ fourcc('Y','U','V','9'), ZBAR_FMT_YUV_PLANAR, { { 2, 2, 0 /*UV*/ } } },
|
151
|
-
{ fourcc('M','J','P','G'), ZBAR_FMT_JPEG, },
|
152
|
-
{ fourcc('4','1','1','P'), ZBAR_FMT_YUV_PLANAR, { { 2, 0, 0 /*UV*/ } } },
|
153
|
-
{ fourcc('R','G','B','P'), ZBAR_FMT_RGB_PACKED,
|
154
|
-
{ { 2, RGB_BITS(11, 5), RGB_BITS(5, 6), RGB_BITS(0, 5) } } },
|
155
|
-
{ fourcc('R','G','B','R'), ZBAR_FMT_RGB_PACKED,
|
156
|
-
{ { 2, RGB_BITS(3, 5), RGB_BITS(13, 6), RGB_BITS(8, 5) } } },
|
157
|
-
{ fourcc('Y','U','Y','V'), ZBAR_FMT_YUV_PACKED,
|
158
|
-
{ { 1, 0, 0, /*YUYV*/ } } },
|
159
|
-
{ fourcc('U','Y','V','Y'), ZBAR_FMT_YUV_PACKED,
|
160
|
-
{ { 1, 0, 2, /*UYVY*/ } } },
|
161
|
-
};
|
162
|
-
|
163
|
-
static const int num_format_defs =
|
164
|
-
sizeof(format_defs) / sizeof(zbar_format_def_t);
|
165
|
-
|
166
|
-
#ifdef DEBUG_CONVERT
|
167
|
-
static int intsort (const void *a,
|
168
|
-
const void *b)
|
169
|
-
{
|
170
|
-
return(*(uint32_t*)a - *(uint32_t*)b);
|
171
|
-
}
|
172
|
-
#endif
|
173
|
-
|
174
|
-
/* verify that format list is in required sort order */
|
175
|
-
static inline int verify_format_sort (void)
|
176
|
-
{
|
177
|
-
int i;
|
178
|
-
for(i = 0; i < num_format_defs; i++) {
|
179
|
-
int j = i * 2 + 1;
|
180
|
-
if((j < num_format_defs &&
|
181
|
-
format_defs[i].format < format_defs[j].format) ||
|
182
|
-
(j + 1 < num_format_defs &&
|
183
|
-
format_defs[j + 1].format < format_defs[i].format))
|
184
|
-
break;
|
185
|
-
}
|
186
|
-
if(i == num_format_defs)
|
187
|
-
return(0);
|
188
|
-
|
189
|
-
/* spew correct order for fix */
|
190
|
-
fprintf(stderr, "ERROR: image format list is not sorted!?\n");
|
191
|
-
|
192
|
-
#ifdef DEBUG_CONVERT
|
193
|
-
assert(num_format_defs);
|
194
|
-
uint32_t sorted[num_format_defs];
|
195
|
-
uint32_t ordered[num_format_defs];
|
196
|
-
for(i = 0; i < num_format_defs; i++)
|
197
|
-
sorted[i] = format_defs[i].format;
|
198
|
-
qsort(sorted, num_format_defs, sizeof(uint32_t), intsort);
|
199
|
-
for(i = 0; i < num_format_defs; i = i << 1 | 1);
|
200
|
-
i = (i - 1) / 2;
|
201
|
-
ordered[i] = sorted[0];
|
202
|
-
int j, k;
|
203
|
-
for(j = 1; j < num_format_defs; j++) {
|
204
|
-
k = i * 2 + 2;
|
205
|
-
if(k < num_format_defs) {
|
206
|
-
i = k;
|
207
|
-
for(k = k * 2 + 1; k < num_format_defs; k = k * 2 + 1)
|
208
|
-
i = k;
|
209
|
-
}
|
210
|
-
else {
|
211
|
-
for(k = (i - 1) / 2; i != k * 2 + 1; k = (i - 1) / 2) {
|
212
|
-
assert(i);
|
213
|
-
i = k;
|
214
|
-
}
|
215
|
-
i = k;
|
216
|
-
}
|
217
|
-
ordered[i] = sorted[j];
|
218
|
-
}
|
219
|
-
fprintf(stderr, "correct sort order is:");
|
220
|
-
for(i = 0; i < num_format_defs; i++)
|
221
|
-
fprintf(stderr, " %4.4s", (char*)&ordered[i]);
|
222
|
-
fprintf(stderr, "\n");
|
223
|
-
#endif
|
224
|
-
return(-1);
|
225
|
-
}
|
226
|
-
|
227
|
-
static inline void uv_round (zbar_image_t *img,
|
228
|
-
const zbar_format_def_t *fmt)
|
229
|
-
{
|
230
|
-
img->width >>= fmt->p.yuv.xsub2;
|
231
|
-
img->width <<= fmt->p.yuv.xsub2;
|
232
|
-
img->height >>= fmt->p.yuv.ysub2;
|
233
|
-
img->height <<= fmt->p.yuv.ysub2;
|
234
|
-
}
|
235
|
-
|
236
|
-
static inline void uv_roundup (zbar_image_t *img,
|
237
|
-
const zbar_format_def_t *fmt)
|
238
|
-
{
|
239
|
-
unsigned xmask, ymask;
|
240
|
-
if(fmt->group == ZBAR_FMT_GRAY)
|
241
|
-
return;
|
242
|
-
xmask = (1 << fmt->p.yuv.xsub2) - 1;
|
243
|
-
if(img->width & xmask)
|
244
|
-
img->width = (img->width + xmask) & ~xmask;
|
245
|
-
ymask = (1 << fmt->p.yuv.ysub2) - 1;
|
246
|
-
if(img->height & ymask)
|
247
|
-
img->height = (img->height + ymask) & ~ymask;
|
248
|
-
}
|
249
|
-
|
250
|
-
static inline unsigned long uvp_size (const zbar_image_t *img,
|
251
|
-
const zbar_format_def_t *fmt)
|
252
|
-
{
|
253
|
-
if(fmt->group == ZBAR_FMT_GRAY)
|
254
|
-
return(0);
|
255
|
-
return((img->width >> fmt->p.yuv.xsub2) *
|
256
|
-
(img->height >> fmt->p.yuv.ysub2));
|
257
|
-
}
|
258
|
-
|
259
|
-
static inline uint32_t convert_read_rgb (const uint8_t *srcp,
|
260
|
-
int bpp)
|
261
|
-
{
|
262
|
-
uint32_t p;
|
263
|
-
if(bpp == 3) {
|
264
|
-
p = *srcp;
|
265
|
-
p |= *(srcp + 1) << 8;
|
266
|
-
p |= *(srcp + 2) << 16;
|
267
|
-
}
|
268
|
-
else if(bpp == 4)
|
269
|
-
p = *((uint32_t*)(srcp));
|
270
|
-
else if(bpp == 2)
|
271
|
-
p = *((uint16_t*)(srcp));
|
272
|
-
else
|
273
|
-
p = *srcp;
|
274
|
-
return(p);
|
275
|
-
}
|
276
|
-
|
277
|
-
static inline void convert_write_rgb (uint8_t *dstp,
|
278
|
-
uint32_t p,
|
279
|
-
int bpp)
|
280
|
-
{
|
281
|
-
if(bpp == 3) {
|
282
|
-
*dstp = p & 0xff;
|
283
|
-
*(dstp + 1) = (p >> 8) & 0xff;
|
284
|
-
*(dstp + 2) = (p >> 16) & 0xff;
|
285
|
-
}
|
286
|
-
else if(bpp == 4)
|
287
|
-
*((uint32_t*)dstp) = p;
|
288
|
-
else if(bpp == 2)
|
289
|
-
*((uint16_t*)dstp) = p;
|
290
|
-
else
|
291
|
-
*dstp = p;
|
292
|
-
}
|
293
|
-
|
294
|
-
/* cleanup linked image by unrefing */
|
295
|
-
static void cleanup_ref (zbar_image_t *img)
|
296
|
-
{
|
297
|
-
if(img->next)
|
298
|
-
_zbar_image_refcnt(img->next, -1);
|
299
|
-
}
|
300
|
-
|
301
|
-
/* resize y plane, drop extra columns/rows from the right/bottom,
|
302
|
-
* or duplicate last column/row to pad missing data
|
303
|
-
*/
|
304
|
-
static inline void convert_y_resize (zbar_image_t *dst,
|
305
|
-
const zbar_format_def_t *dstfmt,
|
306
|
-
const zbar_image_t *src,
|
307
|
-
const zbar_format_def_t *srcfmt,
|
308
|
-
size_t n)
|
309
|
-
{
|
310
|
-
uint8_t *psrc, *pdst;
|
311
|
-
unsigned width, height, xpad, y;
|
312
|
-
|
313
|
-
if(dst->width == src->width && dst->height == src->height) {
|
314
|
-
memcpy((void*)dst->data, src->data, n);
|
315
|
-
return;
|
316
|
-
}
|
317
|
-
psrc = (void*)src->data;
|
318
|
-
pdst = (void*)dst->data;
|
319
|
-
width = (dst->width > src->width) ? src->width : dst->width;
|
320
|
-
xpad = (dst->width > src->width) ? dst->width - src->width : 0;
|
321
|
-
height = (dst->height > src->height) ? src->height : dst->height;
|
322
|
-
for(y = 0; y < height; y++) {
|
323
|
-
memcpy(pdst, psrc, width);
|
324
|
-
pdst += width;
|
325
|
-
psrc += src->width;
|
326
|
-
if(xpad) {
|
327
|
-
memset(pdst, *(psrc - 1), xpad);
|
328
|
-
pdst += xpad;
|
329
|
-
}
|
330
|
-
}
|
331
|
-
psrc -= src->width;
|
332
|
-
for(; y < dst->height; y++) {
|
333
|
-
memcpy(pdst, psrc, width);
|
334
|
-
pdst += width;
|
335
|
-
if(xpad) {
|
336
|
-
memset(pdst, *(psrc - 1), xpad);
|
337
|
-
pdst += xpad;
|
338
|
-
}
|
339
|
-
}
|
340
|
-
}
|
341
|
-
|
342
|
-
/* make new image w/reference to the same image data */
|
343
|
-
static void convert_copy (zbar_image_t *dst,
|
344
|
-
const zbar_format_def_t *dstfmt,
|
345
|
-
const zbar_image_t *src,
|
346
|
-
const zbar_format_def_t *srcfmt)
|
347
|
-
{
|
348
|
-
if(src->width == dst->width &&
|
349
|
-
src->height == dst->height) {
|
350
|
-
zbar_image_t *s = (zbar_image_t*)src;
|
351
|
-
dst->data = src->data;
|
352
|
-
dst->datalen = src->datalen;
|
353
|
-
dst->cleanup = cleanup_ref;
|
354
|
-
dst->next = s;
|
355
|
-
_zbar_image_refcnt(s, 1);
|
356
|
-
}
|
357
|
-
else
|
358
|
-
/* NB only for GRAY/YUV_PLANAR formats */
|
359
|
-
convert_y_resize(dst, dstfmt, src, srcfmt, dst->width * dst->height);
|
360
|
-
}
|
361
|
-
|
362
|
-
/* append neutral UV plane to grayscale image */
|
363
|
-
static void convert_uvp_append (zbar_image_t *dst,
|
364
|
-
const zbar_format_def_t *dstfmt,
|
365
|
-
const zbar_image_t *src,
|
366
|
-
const zbar_format_def_t *srcfmt)
|
367
|
-
{
|
368
|
-
unsigned long n;
|
369
|
-
uv_roundup(dst, dstfmt);
|
370
|
-
dst->datalen = uvp_size(dst, dstfmt) * 2;
|
371
|
-
n = dst->width * dst->height;
|
372
|
-
dst->datalen += n;
|
373
|
-
assert(src->datalen >= src->width * src->height);
|
374
|
-
zprintf(24, "dst=%dx%d (%lx) %lx src=%dx%d %lx\n",
|
375
|
-
dst->width, dst->height, n, dst->datalen,
|
376
|
-
src->width, src->height, src->datalen);
|
377
|
-
dst->data = malloc(dst->datalen);
|
378
|
-
if(!dst->data) return;
|
379
|
-
convert_y_resize(dst, dstfmt, src, srcfmt, n);
|
380
|
-
memset((uint8_t*)dst->data + n, 0x80, dst->datalen - n);
|
381
|
-
}
|
382
|
-
|
383
|
-
/* interleave YUV planes into packed YUV */
|
384
|
-
static void convert_yuv_pack (zbar_image_t *dst,
|
385
|
-
const zbar_format_def_t *dstfmt,
|
386
|
-
const zbar_image_t *src,
|
387
|
-
const zbar_format_def_t *srcfmt)
|
388
|
-
{
|
389
|
-
unsigned long srcm, srcn;
|
390
|
-
uint8_t flags, *srcy, *dstp;
|
391
|
-
const uint8_t *srcu, *srcv;
|
392
|
-
unsigned srcl, xmask, ymask, x, y;
|
393
|
-
uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
|
394
|
-
|
395
|
-
uv_roundup(dst, dstfmt);
|
396
|
-
dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
|
397
|
-
dst->data = malloc(dst->datalen);
|
398
|
-
if(!dst->data) return;
|
399
|
-
dstp = (void*)dst->data;
|
400
|
-
|
401
|
-
srcm = uvp_size(src, srcfmt);
|
402
|
-
srcn = src->width * src->height;
|
403
|
-
assert(src->datalen >= srcn + 2 * srcn);
|
404
|
-
flags = dstfmt->p.yuv.packorder ^ srcfmt->p.yuv.packorder;
|
405
|
-
srcy = (void*)src->data;
|
406
|
-
if(flags & 1) {
|
407
|
-
srcv = (uint8_t*)src->data + srcn;
|
408
|
-
srcu = srcv + srcm;
|
409
|
-
} else {
|
410
|
-
srcu = (uint8_t*)src->data + srcn;
|
411
|
-
srcv = srcu + srcm;
|
412
|
-
}
|
413
|
-
flags = dstfmt->p.yuv.packorder & 2;
|
414
|
-
|
415
|
-
srcl = src->width >> srcfmt->p.yuv.xsub2;
|
416
|
-
xmask = (1 << srcfmt->p.yuv.xsub2) - 1;
|
417
|
-
ymask = (1 << srcfmt->p.yuv.ysub2) - 1;
|
418
|
-
for(y = 0; y < dst->height; y++) {
|
419
|
-
if(y >= src->height) {
|
420
|
-
srcy -= src->width;
|
421
|
-
srcu -= srcl; srcv -= srcl;
|
422
|
-
}
|
423
|
-
else if(y & ymask) {
|
424
|
-
srcu -= srcl; srcv -= srcl;
|
425
|
-
}
|
426
|
-
for(x = 0; x < dst->width; x += 2) {
|
427
|
-
if(x < src->width) {
|
428
|
-
y0 = *(srcy++); y1 = *(srcy++);
|
429
|
-
if(!(x & xmask)) {
|
430
|
-
u = *(srcu++); v = *(srcv++);
|
431
|
-
}
|
432
|
-
}
|
433
|
-
if(flags) {
|
434
|
-
*(dstp++) = u; *(dstp++) = y0;
|
435
|
-
*(dstp++) = v; *(dstp++) = y1;
|
436
|
-
} else {
|
437
|
-
*(dstp++) = y0; *(dstp++) = u;
|
438
|
-
*(dstp++) = y1; *(dstp++) = v;
|
439
|
-
}
|
440
|
-
}
|
441
|
-
for(; x < src->width; x += 2) {
|
442
|
-
srcy += 2;
|
443
|
-
if(!(x & xmask)) {
|
444
|
-
srcu++; srcv++;
|
445
|
-
}
|
446
|
-
}
|
447
|
-
}
|
448
|
-
}
|
449
|
-
|
450
|
-
/* split packed YUV samples and join into YUV planes
|
451
|
-
* FIXME currently ignores color and grayscales the image
|
452
|
-
*/
|
453
|
-
static void convert_yuv_unpack (zbar_image_t *dst,
|
454
|
-
const zbar_format_def_t *dstfmt,
|
455
|
-
const zbar_image_t *src,
|
456
|
-
const zbar_format_def_t *srcfmt)
|
457
|
-
{
|
458
|
-
unsigned long dstn, dstm2;
|
459
|
-
uint8_t *dsty, flags;
|
460
|
-
const uint8_t *srcp;
|
461
|
-
unsigned srcl, x, y;
|
462
|
-
uint8_t y0 = 0, y1 = 0;
|
463
|
-
|
464
|
-
uv_roundup(dst, dstfmt);
|
465
|
-
dstn = dst->width * dst->height;
|
466
|
-
dstm2 = uvp_size(dst, dstfmt) * 2;
|
467
|
-
dst->datalen = dstn + dstm2;
|
468
|
-
dst->data = malloc(dst->datalen);
|
469
|
-
if(!dst->data) return;
|
470
|
-
if(dstm2)
|
471
|
-
memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
|
472
|
-
dsty = (uint8_t*)dst->data;
|
473
|
-
|
474
|
-
flags = srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder;
|
475
|
-
flags &= 2;
|
476
|
-
srcp = src->data;
|
477
|
-
if(flags)
|
478
|
-
srcp++;
|
479
|
-
|
480
|
-
srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
|
481
|
-
for(y = 0; y < dst->height; y++) {
|
482
|
-
if(y >= src->height)
|
483
|
-
srcp -= srcl;
|
484
|
-
for(x = 0; x < dst->width; x += 2) {
|
485
|
-
if(x < src->width) {
|
486
|
-
y0 = *(srcp++); srcp++;
|
487
|
-
y1 = *(srcp++); srcp++;
|
488
|
-
}
|
489
|
-
*(dsty++) = y0;
|
490
|
-
*(dsty++) = y1;
|
491
|
-
}
|
492
|
-
if(x < src->width)
|
493
|
-
srcp += (src->width - x) * 2;
|
494
|
-
}
|
495
|
-
}
|
496
|
-
|
497
|
-
/* resample and resize UV plane(s)
|
498
|
-
* FIXME currently ignores color and grayscales the image
|
499
|
-
*/
|
500
|
-
static void convert_uvp_resample (zbar_image_t *dst,
|
501
|
-
const zbar_format_def_t *dstfmt,
|
502
|
-
const zbar_image_t *src,
|
503
|
-
const zbar_format_def_t *srcfmt)
|
504
|
-
{
|
505
|
-
unsigned long dstn, dstm2;
|
506
|
-
uv_roundup(dst, dstfmt);
|
507
|
-
dstn = dst->width * dst->height;
|
508
|
-
dstm2 = uvp_size(dst, dstfmt) * 2;
|
509
|
-
dst->datalen = dstn + dstm2;
|
510
|
-
dst->data = malloc(dst->datalen);
|
511
|
-
if(!dst->data) return;
|
512
|
-
convert_y_resize(dst, dstfmt, src, srcfmt, dstn);
|
513
|
-
if(dstm2)
|
514
|
-
memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
|
515
|
-
}
|
516
|
-
|
517
|
-
/* rearrange interleaved UV componets */
|
518
|
-
static void convert_uv_resample (zbar_image_t *dst,
|
519
|
-
const zbar_format_def_t *dstfmt,
|
520
|
-
const zbar_image_t *src,
|
521
|
-
const zbar_format_def_t *srcfmt)
|
522
|
-
{
|
523
|
-
unsigned long dstn;
|
524
|
-
uint8_t *dstp, flags;
|
525
|
-
const uint8_t *srcp;
|
526
|
-
unsigned srcl, x, y;
|
527
|
-
uint8_t y0 = 0, y1 = 0, u = 0x80, v = 0x80;
|
528
|
-
|
529
|
-
uv_roundup(dst, dstfmt);
|
530
|
-
dstn = dst->width * dst->height;
|
531
|
-
dst->datalen = dstn + uvp_size(dst, dstfmt) * 2;
|
532
|
-
dst->data = malloc(dst->datalen);
|
533
|
-
if(!dst->data) return;
|
534
|
-
dstp = (void*)dst->data;
|
535
|
-
|
536
|
-
flags = (srcfmt->p.yuv.packorder ^ dstfmt->p.yuv.packorder) & 1;
|
537
|
-
srcp = src->data;
|
538
|
-
|
539
|
-
srcl = src->width + (src->width >> srcfmt->p.yuv.xsub2);
|
540
|
-
for(y = 0; y < dst->height; y++) {
|
541
|
-
if(y >= src->height)
|
542
|
-
srcp -= srcl;
|
543
|
-
for(x = 0; x < dst->width; x += 2) {
|
544
|
-
if(x < src->width) {
|
545
|
-
if(!(srcfmt->p.yuv.packorder & 2)) {
|
546
|
-
y0 = *(srcp++); u = *(srcp++);
|
547
|
-
y1 = *(srcp++); v = *(srcp++);
|
548
|
-
}
|
549
|
-
else {
|
550
|
-
u = *(srcp++); y0 = *(srcp++);
|
551
|
-
v = *(srcp++); y1 = *(srcp++);
|
552
|
-
}
|
553
|
-
if(flags) {
|
554
|
-
uint8_t tmp = u; u = v; v = tmp;
|
555
|
-
}
|
556
|
-
}
|
557
|
-
if(!(dstfmt->p.yuv.packorder & 2)) {
|
558
|
-
*(dstp++) = y0; *(dstp++) = u;
|
559
|
-
*(dstp++) = y1; *(dstp++) = v;
|
560
|
-
}
|
561
|
-
else {
|
562
|
-
*(dstp++) = u; *(dstp++) = y0;
|
563
|
-
*(dstp++) = v; *(dstp++) = y1;
|
564
|
-
}
|
565
|
-
}
|
566
|
-
if(x < src->width)
|
567
|
-
srcp += (src->width - x) * 2;
|
568
|
-
}
|
569
|
-
}
|
570
|
-
|
571
|
-
/* YUV planes to packed RGB
|
572
|
-
* FIXME currently ignores color and grayscales the image
|
573
|
-
*/
|
574
|
-
static void convert_yuvp_to_rgb (zbar_image_t *dst,
|
575
|
-
const zbar_format_def_t *dstfmt,
|
576
|
-
const zbar_image_t *src,
|
577
|
-
const zbar_format_def_t *srcfmt)
|
578
|
-
{
|
579
|
-
uint8_t *dstp, *srcy;
|
580
|
-
int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
|
581
|
-
unsigned long srcm, srcn;
|
582
|
-
unsigned x, y;
|
583
|
-
uint32_t p = 0;
|
584
|
-
|
585
|
-
dst->datalen = dst->width * dst->height * dstfmt->p.rgb.bpp;
|
586
|
-
dst->data = malloc(dst->datalen);
|
587
|
-
if(!dst->data) return;
|
588
|
-
dstp = (void*)dst->data;
|
589
|
-
|
590
|
-
drbits = RGB_SIZE(dstfmt->p.rgb.red);
|
591
|
-
drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
|
592
|
-
dgbits = RGB_SIZE(dstfmt->p.rgb.green);
|
593
|
-
dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
|
594
|
-
dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
|
595
|
-
dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
|
596
|
-
|
597
|
-
srcm = uvp_size(src, srcfmt);
|
598
|
-
srcn = src->width * src->height;
|
599
|
-
assert(src->datalen >= srcn + 2 * srcm);
|
600
|
-
srcy = (void*)src->data;
|
601
|
-
|
602
|
-
for(y = 0; y < dst->height; y++) {
|
603
|
-
if(y >= src->height)
|
604
|
-
srcy -= src->width;
|
605
|
-
for(x = 0; x < dst->width; x++) {
|
606
|
-
if(x < src->width) {
|
607
|
-
/* FIXME color space? */
|
608
|
-
unsigned y0 = *(srcy++);
|
609
|
-
p = (((y0 >> drbits) << drbit0) |
|
610
|
-
((y0 >> dgbits) << dgbit0) |
|
611
|
-
((y0 >> dbbits) << dbbit0));
|
612
|
-
}
|
613
|
-
convert_write_rgb(dstp, p, dstfmt->p.rgb.bpp);
|
614
|
-
dstp += dstfmt->p.rgb.bpp;
|
615
|
-
}
|
616
|
-
if(x < src->width)
|
617
|
-
srcy += (src->width - x);
|
618
|
-
}
|
619
|
-
}
|
620
|
-
|
621
|
-
/* packed RGB to YUV planes
|
622
|
-
* FIXME currently ignores color and grayscales the image
|
623
|
-
*/
|
624
|
-
static void convert_rgb_to_yuvp (zbar_image_t *dst,
|
625
|
-
const zbar_format_def_t *dstfmt,
|
626
|
-
const zbar_image_t *src,
|
627
|
-
const zbar_format_def_t *srcfmt)
|
628
|
-
{
|
629
|
-
unsigned long dstn, dstm2;
|
630
|
-
uint8_t *dsty;
|
631
|
-
const uint8_t *srcp;
|
632
|
-
int rbits, rbit0, gbits, gbit0, bbits, bbit0;
|
633
|
-
unsigned srcl, x, y;
|
634
|
-
uint16_t y0 = 0;
|
635
|
-
|
636
|
-
uv_roundup(dst, dstfmt);
|
637
|
-
dstn = dst->width * dst->height;
|
638
|
-
dstm2 = uvp_size(dst, dstfmt) * 2;
|
639
|
-
dst->datalen = dstn + dstm2;
|
640
|
-
dst->data = malloc(dst->datalen);
|
641
|
-
if(!dst->data) return;
|
642
|
-
if(dstm2)
|
643
|
-
memset((uint8_t*)dst->data + dstn, 0x80, dstm2);
|
644
|
-
dsty = (void*)dst->data;
|
645
|
-
|
646
|
-
assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
|
647
|
-
srcp = src->data;
|
648
|
-
|
649
|
-
rbits = RGB_SIZE(srcfmt->p.rgb.red);
|
650
|
-
rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
|
651
|
-
gbits = RGB_SIZE(srcfmt->p.rgb.green);
|
652
|
-
gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
|
653
|
-
bbits = RGB_SIZE(srcfmt->p.rgb.blue);
|
654
|
-
bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
|
655
|
-
|
656
|
-
srcl = src->width * srcfmt->p.rgb.bpp;
|
657
|
-
for(y = 0; y < dst->height; y++) {
|
658
|
-
if(y >= src->height)
|
659
|
-
srcp -= srcl;
|
660
|
-
for(x = 0; x < dst->width; x++) {
|
661
|
-
if(x < src->width) {
|
662
|
-
uint8_t r, g, b;
|
663
|
-
uint32_t p = convert_read_rgb(srcp, srcfmt->p.rgb.bpp);
|
664
|
-
srcp += srcfmt->p.rgb.bpp;
|
665
|
-
|
666
|
-
/* FIXME endianness? */
|
667
|
-
r = ((p >> rbit0) << rbits) & 0xff;
|
668
|
-
g = ((p >> gbit0) << gbits) & 0xff;
|
669
|
-
b = ((p >> bbit0) << bbits) & 0xff;
|
670
|
-
|
671
|
-
/* FIXME color space? */
|
672
|
-
y0 = ((77 * r + 150 * g + 29 * b) + 0x80) >> 8;
|
673
|
-
}
|
674
|
-
*(dsty++) = y0;
|
675
|
-
}
|
676
|
-
if(x < src->width)
|
677
|
-
srcp += (src->width - x) * srcfmt->p.rgb.bpp;
|
678
|
-
}
|
679
|
-
}
|
680
|
-
|
681
|
-
/* packed YUV to packed RGB */
|
682
|
-
static void convert_yuv_to_rgb (zbar_image_t *dst,
|
683
|
-
const zbar_format_def_t *dstfmt,
|
684
|
-
const zbar_image_t *src,
|
685
|
-
const zbar_format_def_t *srcfmt)
|
686
|
-
{
|
687
|
-
uint8_t *dstp;
|
688
|
-
unsigned long dstn = dst->width * dst->height;
|
689
|
-
int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
|
690
|
-
const uint8_t *srcp;
|
691
|
-
unsigned srcl, x, y;
|
692
|
-
uint32_t p = 0;
|
693
|
-
|
694
|
-
dst->datalen = dstn * dstfmt->p.rgb.bpp;
|
695
|
-
dst->data = malloc(dst->datalen);
|
696
|
-
if(!dst->data) return;
|
697
|
-
dstp = (void*)dst->data;
|
698
|
-
|
699
|
-
drbits = RGB_SIZE(dstfmt->p.rgb.red);
|
700
|
-
drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
|
701
|
-
dgbits = RGB_SIZE(dstfmt->p.rgb.green);
|
702
|
-
dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
|
703
|
-
dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
|
704
|
-
dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
|
705
|
-
|
706
|
-
assert(src->datalen >= (src->width * src->height +
|
707
|
-
uvp_size(src, srcfmt) * 2));
|
708
|
-
srcp = src->data;
|
709
|
-
if(srcfmt->p.yuv.packorder & 2)
|
710
|
-
srcp++;
|
711
|
-
|
712
|
-
assert(srcfmt->p.yuv.xsub2 == 1);
|
713
|
-
srcl = src->width + (src->width >> 1);
|
714
|
-
for(y = 0; y < dst->height; y++) {
|
715
|
-
if(y >= src->height)
|
716
|
-
srcp -= srcl;
|
717
|
-
for(x = 0; x < dst->width; x++) {
|
718
|
-
if(x < src->width) {
|
719
|
-
uint8_t y0 = *(srcp++);
|
720
|
-
srcp++;
|
721
|
-
|
722
|
-
if(y0 <= 16)
|
723
|
-
y0 = 0;
|
724
|
-
else if(y0 >= 235)
|
725
|
-
y0 = 255;
|
726
|
-
else
|
727
|
-
y0 = (uint16_t)(y0 - 16) * 255 / 219;
|
728
|
-
|
729
|
-
p = (((y0 >> drbits) << drbit0) |
|
730
|
-
((y0 >> dgbits) << dgbit0) |
|
731
|
-
((y0 >> dbbits) << dbbit0));
|
732
|
-
}
|
733
|
-
convert_write_rgb(dstp, p, dstfmt->p.rgb.bpp);
|
734
|
-
dstp += dstfmt->p.rgb.bpp;
|
735
|
-
}
|
736
|
-
if(x < src->width)
|
737
|
-
srcp += (src->width - x) * 2;
|
738
|
-
}
|
739
|
-
}
|
740
|
-
|
741
|
-
/* packed RGB to packed YUV
|
742
|
-
* FIXME currently ignores color and grayscales the image
|
743
|
-
*/
|
744
|
-
static void convert_rgb_to_yuv (zbar_image_t *dst,
|
745
|
-
const zbar_format_def_t *dstfmt,
|
746
|
-
const zbar_image_t *src,
|
747
|
-
const zbar_format_def_t *srcfmt)
|
748
|
-
{
|
749
|
-
uint8_t *dstp, flags;
|
750
|
-
const uint8_t *srcp;
|
751
|
-
int rbits, rbit0, gbits, gbit0, bbits, bbit0;
|
752
|
-
unsigned srcl, x, y;
|
753
|
-
uint16_t y0 = 0;
|
754
|
-
|
755
|
-
uv_roundup(dst, dstfmt);
|
756
|
-
dst->datalen = dst->width * dst->height + uvp_size(dst, dstfmt) * 2;
|
757
|
-
dst->data = malloc(dst->datalen);
|
758
|
-
if(!dst->data) return;
|
759
|
-
dstp = (void*)dst->data;
|
760
|
-
flags = dstfmt->p.yuv.packorder & 2;
|
761
|
-
|
762
|
-
assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
|
763
|
-
srcp = src->data;
|
764
|
-
|
765
|
-
rbits = RGB_SIZE(srcfmt->p.rgb.red);
|
766
|
-
rbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
|
767
|
-
gbits = RGB_SIZE(srcfmt->p.rgb.green);
|
768
|
-
gbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
|
769
|
-
bbits = RGB_SIZE(srcfmt->p.rgb.blue);
|
770
|
-
bbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
|
771
|
-
|
772
|
-
srcl = src->width * srcfmt->p.rgb.bpp;
|
773
|
-
for(y = 0; y < dst->height; y++) {
|
774
|
-
if(y >= src->height)
|
775
|
-
srcp -= srcl;
|
776
|
-
for(x = 0; x < dst->width; x++) {
|
777
|
-
if(x < src->width) {
|
778
|
-
uint8_t r, g, b;
|
779
|
-
uint32_t p = convert_read_rgb(srcp, srcfmt->p.rgb.bpp);
|
780
|
-
srcp += srcfmt->p.rgb.bpp;
|
781
|
-
|
782
|
-
/* FIXME endianness? */
|
783
|
-
r = ((p >> rbit0) << rbits) & 0xff;
|
784
|
-
g = ((p >> gbit0) << gbits) & 0xff;
|
785
|
-
b = ((p >> bbit0) << bbits) & 0xff;
|
786
|
-
|
787
|
-
/* FIXME color space? */
|
788
|
-
y0 = ((77 * r + 150 * g + 29 * b) + 0x80) >> 8;
|
789
|
-
}
|
790
|
-
if(flags) {
|
791
|
-
*(dstp++) = 0x80; *(dstp++) = y0;
|
792
|
-
}
|
793
|
-
else {
|
794
|
-
*(dstp++) = y0; *(dstp++) = 0x80;
|
795
|
-
}
|
796
|
-
}
|
797
|
-
if(x < src->width)
|
798
|
-
srcp += (src->width - x) * srcfmt->p.rgb.bpp;
|
799
|
-
}
|
800
|
-
}
|
801
|
-
|
802
|
-
/* resample and resize packed RGB components */
|
803
|
-
static void convert_rgb_resample (zbar_image_t *dst,
|
804
|
-
const zbar_format_def_t *dstfmt,
|
805
|
-
const zbar_image_t *src,
|
806
|
-
const zbar_format_def_t *srcfmt)
|
807
|
-
{
|
808
|
-
unsigned long dstn = dst->width * dst->height;
|
809
|
-
uint8_t *dstp;
|
810
|
-
int drbits, drbit0, dgbits, dgbit0, dbbits, dbbit0;
|
811
|
-
int srbits, srbit0, sgbits, sgbit0, sbbits, sbbit0;
|
812
|
-
const uint8_t *srcp;
|
813
|
-
unsigned srcl, x, y;
|
814
|
-
uint32_t p = 0;
|
815
|
-
|
816
|
-
dst->datalen = dstn * dstfmt->p.rgb.bpp;
|
817
|
-
dst->data = malloc(dst->datalen);
|
818
|
-
if(!dst->data) return;
|
819
|
-
dstp = (void*)dst->data;
|
820
|
-
|
821
|
-
drbits = RGB_SIZE(dstfmt->p.rgb.red);
|
822
|
-
drbit0 = RGB_OFFSET(dstfmt->p.rgb.red);
|
823
|
-
dgbits = RGB_SIZE(dstfmt->p.rgb.green);
|
824
|
-
dgbit0 = RGB_OFFSET(dstfmt->p.rgb.green);
|
825
|
-
dbbits = RGB_SIZE(dstfmt->p.rgb.blue);
|
826
|
-
dbbit0 = RGB_OFFSET(dstfmt->p.rgb.blue);
|
827
|
-
|
828
|
-
assert(src->datalen >= (src->width * src->height * srcfmt->p.rgb.bpp));
|
829
|
-
srcp = src->data;
|
830
|
-
|
831
|
-
srbits = RGB_SIZE(srcfmt->p.rgb.red);
|
832
|
-
srbit0 = RGB_OFFSET(srcfmt->p.rgb.red);
|
833
|
-
sgbits = RGB_SIZE(srcfmt->p.rgb.green);
|
834
|
-
sgbit0 = RGB_OFFSET(srcfmt->p.rgb.green);
|
835
|
-
sbbits = RGB_SIZE(srcfmt->p.rgb.blue);
|
836
|
-
sbbit0 = RGB_OFFSET(srcfmt->p.rgb.blue);
|
837
|
-
|
838
|
-
srcl = src->width * srcfmt->p.rgb.bpp;
|
839
|
-
for(y = 0; y < dst->height; y++) {
|
840
|
-
if(y >= src->height)
|
841
|
-
y -= srcl;
|
842
|
-
for(x = 0; x < dst->width; x++) {
|
843
|
-
if(x < src->width) {
|
844
|
-
uint8_t r, g, b;
|
845
|
-
p = convert_read_rgb(srcp, srcfmt->p.rgb.bpp);
|
846
|
-
srcp += srcfmt->p.rgb.bpp;
|
847
|
-
|
848
|
-
/* FIXME endianness? */
|
849
|
-
r = (p >> srbit0) << srbits;
|
850
|
-
g = (p >> sgbit0) << sgbits;
|
851
|
-
b = (p >> sbbit0) << sbbits;
|
852
|
-
|
853
|
-
p = (((r >> drbits) << drbit0) |
|
854
|
-
((g >> dgbits) << dgbit0) |
|
855
|
-
((b >> dbbits) << dbbit0));
|
856
|
-
}
|
857
|
-
convert_write_rgb(dstp, p, dstfmt->p.rgb.bpp);
|
858
|
-
dstp += dstfmt->p.rgb.bpp;
|
859
|
-
}
|
860
|
-
if(x < src->width)
|
861
|
-
srcp += (src->width - x) * srcfmt->p.rgb.bpp;
|
862
|
-
}
|
863
|
-
}
|
864
|
-
|
865
|
-
#ifdef HAVE_LIBJPEG
|
866
|
-
void _zbar_convert_jpeg_to_y(zbar_image_t *dst,
|
867
|
-
const zbar_format_def_t *dstfmt,
|
868
|
-
const zbar_image_t *src,
|
869
|
-
const zbar_format_def_t *srcfmt);
|
870
|
-
|
871
|
-
static void convert_jpeg(zbar_image_t *dst,
|
872
|
-
const zbar_format_def_t *dstfmt,
|
873
|
-
const zbar_image_t *src,
|
874
|
-
const zbar_format_def_t *srcfmt);
|
875
|
-
#endif
|
876
|
-
|
877
|
-
/* group conversion matrix */
|
878
|
-
static conversion_def_t conversions[][ZBAR_FMT_NUM] = {
|
879
|
-
{ /* *from* GRAY */
|
880
|
-
{ 0, convert_copy }, /* to GRAY */
|
881
|
-
{ 8, convert_uvp_append }, /* to YUV_PLANAR */
|
882
|
-
{ 24, convert_yuv_pack }, /* to YUV_PACKED */
|
883
|
-
{ 32, convert_yuvp_to_rgb }, /* to RGB_PACKED */
|
884
|
-
{ 8, convert_uvp_append }, /* to YUV_NV */
|
885
|
-
{ -1, NULL }, /* to JPEG */
|
886
|
-
},
|
887
|
-
{ /* from YUV_PLANAR */
|
888
|
-
{ 1, convert_copy }, /* to GRAY */
|
889
|
-
{ 48, convert_uvp_resample }, /* to YUV_PLANAR */
|
890
|
-
{ 64, convert_yuv_pack }, /* to YUV_PACKED */
|
891
|
-
{ 128, convert_yuvp_to_rgb }, /* to RGB_PACKED */
|
892
|
-
{ 40, convert_uvp_append }, /* to YUV_NV */
|
893
|
-
{ -1, NULL }, /* to JPEG */
|
894
|
-
},
|
895
|
-
{ /* from YUV_PACKED */
|
896
|
-
{ 24, convert_yuv_unpack }, /* to GRAY */
|
897
|
-
{ 52, convert_yuv_unpack }, /* to YUV_PLANAR */
|
898
|
-
{ 20, convert_uv_resample }, /* to YUV_PACKED */
|
899
|
-
{ 144, convert_yuv_to_rgb }, /* to RGB_PACKED */
|
900
|
-
{ 18, convert_yuv_unpack }, /* to YUV_NV */
|
901
|
-
{ -1, NULL }, /* to JPEG */
|
902
|
-
},
|
903
|
-
{ /* from RGB_PACKED */
|
904
|
-
{ 112, convert_rgb_to_yuvp }, /* to GRAY */
|
905
|
-
{ 160, convert_rgb_to_yuvp }, /* to YUV_PLANAR */
|
906
|
-
{ 144, convert_rgb_to_yuv }, /* to YUV_PACKED */
|
907
|
-
{ 120, convert_rgb_resample }, /* to RGB_PACKED */
|
908
|
-
{ 152, convert_rgb_to_yuvp }, /* to YUV_NV */
|
909
|
-
{ -1, NULL }, /* to JPEG */
|
910
|
-
},
|
911
|
-
{ /* from YUV_NV (FIXME treated as GRAY) */
|
912
|
-
{ 1, convert_copy }, /* to GRAY */
|
913
|
-
{ 8, convert_uvp_append }, /* to YUV_PLANAR */
|
914
|
-
{ 24, convert_yuv_pack }, /* to YUV_PACKED */
|
915
|
-
{ 32, convert_yuvp_to_rgb }, /* to RGB_PACKED */
|
916
|
-
{ 8, convert_uvp_append }, /* to YUV_NV */
|
917
|
-
{ -1, NULL }, /* to JPEG */
|
918
|
-
},
|
919
|
-
#ifdef HAVE_LIBJPEG
|
920
|
-
{ /* from JPEG */
|
921
|
-
{ 96, _zbar_convert_jpeg_to_y }, /* to GRAY */
|
922
|
-
{ 104, convert_jpeg }, /* to YUV_PLANAR */
|
923
|
-
{ 116, convert_jpeg }, /* to YUV_PACKED */
|
924
|
-
{ 256, convert_jpeg }, /* to RGB_PACKED */
|
925
|
-
{ 104, convert_jpeg }, /* to YUV_NV */
|
926
|
-
{ -1, NULL }, /* to JPEG */
|
927
|
-
},
|
928
|
-
#else
|
929
|
-
{ /* from JPEG */
|
930
|
-
{ -1, NULL }, /* to GRAY */
|
931
|
-
{ -1, NULL }, /* to YUV_PLANAR */
|
932
|
-
{ -1, NULL }, /* to YUV_PACKED */
|
933
|
-
{ -1, NULL }, /* to RGB_PACKED */
|
934
|
-
{ -1, NULL }, /* to YUV_NV */
|
935
|
-
{ -1, NULL }, /* to JPEG */
|
936
|
-
},
|
937
|
-
#endif
|
938
|
-
};
|
939
|
-
|
940
|
-
const zbar_format_def_t *_zbar_format_lookup (uint32_t fmt)
|
941
|
-
{
|
942
|
-
const zbar_format_def_t *def = NULL;
|
943
|
-
int i = 0;
|
944
|
-
while(i < num_format_defs) {
|
945
|
-
def = &format_defs[i];
|
946
|
-
if(fmt == def->format)
|
947
|
-
return(def);
|
948
|
-
i = i * 2 + 1;
|
949
|
-
if(fmt > def->format)
|
950
|
-
i++;
|
951
|
-
}
|
952
|
-
return(NULL);
|
953
|
-
}
|
954
|
-
|
955
|
-
#ifdef HAVE_LIBJPEG
|
956
|
-
/* convert JPEG data via an intermediate format supported by libjpeg */
|
957
|
-
static void convert_jpeg (zbar_image_t *dst,
|
958
|
-
const zbar_format_def_t *dstfmt,
|
959
|
-
const zbar_image_t *src,
|
960
|
-
const zbar_format_def_t *srcfmt)
|
961
|
-
{
|
962
|
-
/* define intermediate image in a format supported by libjpeg
|
963
|
-
* (currently only grayscale)
|
964
|
-
*/
|
965
|
-
zbar_image_t *tmp;
|
966
|
-
if(!src->src) {
|
967
|
-
tmp = zbar_image_create();
|
968
|
-
tmp->format = fourcc('Y','8','0','0');
|
969
|
-
_zbar_image_copy_size(tmp, dst);
|
970
|
-
}
|
971
|
-
else {
|
972
|
-
tmp = src->src->jpeg_img;
|
973
|
-
assert(tmp);
|
974
|
-
_zbar_image_copy_size(dst, tmp);
|
975
|
-
}
|
976
|
-
|
977
|
-
const zbar_format_def_t *tmpfmt = _zbar_format_lookup(tmp->format);
|
978
|
-
assert(tmpfmt);
|
979
|
-
|
980
|
-
/* convert to intermediate format */
|
981
|
-
_zbar_convert_jpeg_to_y(tmp, tmpfmt, src, srcfmt);
|
982
|
-
|
983
|
-
/* now convert to dst */
|
984
|
-
_zbar_image_copy_size(dst, tmp);
|
985
|
-
|
986
|
-
conversion_handler_t *func =
|
987
|
-
conversions[tmpfmt->group][dstfmt->group].func;
|
988
|
-
|
989
|
-
func(dst, dstfmt, tmp, tmpfmt);
|
990
|
-
|
991
|
-
if(!src->src)
|
992
|
-
zbar_image_destroy(tmp);
|
993
|
-
}
|
994
|
-
#endif
|
995
|
-
|
996
|
-
zbar_image_t *zbar_image_convert_resize (const zbar_image_t *src,
|
997
|
-
unsigned long fmt,
|
998
|
-
unsigned width,
|
999
|
-
unsigned height)
|
1000
|
-
{
|
1001
|
-
const zbar_format_def_t *srcfmt, *dstfmt;
|
1002
|
-
conversion_handler_t *func;
|
1003
|
-
zbar_image_t *dst = zbar_image_create();
|
1004
|
-
dst->format = fmt;
|
1005
|
-
dst->width = width;
|
1006
|
-
dst->height = height;
|
1007
|
-
zbar_image_set_crop(dst, src->crop_x, src->crop_y,
|
1008
|
-
src->crop_w, src->crop_h);
|
1009
|
-
if(src->format == fmt &&
|
1010
|
-
src->width == width &&
|
1011
|
-
src->height == height) {
|
1012
|
-
convert_copy(dst, NULL, src, NULL);
|
1013
|
-
return(dst);
|
1014
|
-
}
|
1015
|
-
|
1016
|
-
srcfmt = _zbar_format_lookup(src->format);
|
1017
|
-
dstfmt = _zbar_format_lookup(dst->format);
|
1018
|
-
if(!srcfmt || !dstfmt)
|
1019
|
-
/* FIXME free dst */
|
1020
|
-
return(NULL);
|
1021
|
-
|
1022
|
-
if(srcfmt->group == dstfmt->group &&
|
1023
|
-
srcfmt->p.cmp == dstfmt->p.cmp &&
|
1024
|
-
src->width == width &&
|
1025
|
-
src->height == height) {
|
1026
|
-
convert_copy(dst, NULL, src, NULL);
|
1027
|
-
return(dst);
|
1028
|
-
}
|
1029
|
-
|
1030
|
-
func = conversions[srcfmt->group][dstfmt->group].func;
|
1031
|
-
|
1032
|
-
dst->cleanup = zbar_image_free_data;
|
1033
|
-
func(dst, dstfmt, src, srcfmt);
|
1034
|
-
if(!dst->data) {
|
1035
|
-
/* conversion failed */
|
1036
|
-
zbar_image_destroy(dst);
|
1037
|
-
return(NULL);
|
1038
|
-
}
|
1039
|
-
return(dst);
|
1040
|
-
}
|
1041
|
-
|
1042
|
-
zbar_image_t *zbar_image_convert (const zbar_image_t *src,
|
1043
|
-
unsigned long fmt)
|
1044
|
-
{
|
1045
|
-
return(zbar_image_convert_resize(src, fmt, src->width, src->height));
|
1046
|
-
}
|
1047
|
-
|
1048
|
-
static inline int has_format (uint32_t fmt,
|
1049
|
-
const uint32_t *fmts)
|
1050
|
-
{
|
1051
|
-
for(; *fmts; fmts++)
|
1052
|
-
if(*fmts == fmt)
|
1053
|
-
return(1);
|
1054
|
-
return(0);
|
1055
|
-
}
|
1056
|
-
|
1057
|
-
/* select least cost conversion from src format to available dsts */
|
1058
|
-
int _zbar_best_format (uint32_t src,
|
1059
|
-
uint32_t *dst,
|
1060
|
-
const uint32_t *dsts)
|
1061
|
-
{
|
1062
|
-
const zbar_format_def_t *srcfmt;
|
1063
|
-
unsigned min_cost = -1;
|
1064
|
-
|
1065
|
-
if(dst)
|
1066
|
-
*dst = 0;
|
1067
|
-
if(!dsts)
|
1068
|
-
return(-1);
|
1069
|
-
if(has_format(src, dsts)) {
|
1070
|
-
zprintf(8, "shared format: %4.4s\n", (char*)&src);
|
1071
|
-
if(dst)
|
1072
|
-
*dst = src;
|
1073
|
-
return(0);
|
1074
|
-
}
|
1075
|
-
srcfmt = _zbar_format_lookup(src);
|
1076
|
-
if(!srcfmt)
|
1077
|
-
return(-1);
|
1078
|
-
|
1079
|
-
zprintf(8, "from %.4s(%08" PRIx32 ") to", (char*)&src, src);
|
1080
|
-
for(; *dsts; dsts++) {
|
1081
|
-
const zbar_format_def_t *dstfmt = _zbar_format_lookup(*dsts);
|
1082
|
-
int cost;
|
1083
|
-
if(!dstfmt)
|
1084
|
-
continue;
|
1085
|
-
if(srcfmt->group == dstfmt->group &&
|
1086
|
-
srcfmt->p.cmp == dstfmt->p.cmp)
|
1087
|
-
cost = 0;
|
1088
|
-
else
|
1089
|
-
cost = conversions[srcfmt->group][dstfmt->group].cost;
|
1090
|
-
|
1091
|
-
if(_zbar_verbosity >= 8)
|
1092
|
-
fprintf(stderr, " %.4s(%08" PRIx32 ")=%d",
|
1093
|
-
(char*)dsts, *dsts, cost);
|
1094
|
-
if(cost >= 0 && min_cost > cost) {
|
1095
|
-
min_cost = cost;
|
1096
|
-
if(dst)
|
1097
|
-
*dst = *dsts;
|
1098
|
-
}
|
1099
|
-
}
|
1100
|
-
if(_zbar_verbosity >= 8)
|
1101
|
-
fprintf(stderr, "\n");
|
1102
|
-
return(min_cost);
|
1103
|
-
}
|
1104
|
-
|
1105
|
-
int zbar_negotiate_format (zbar_video_t *vdo,
|
1106
|
-
zbar_window_t *win)
|
1107
|
-
{
|
1108
|
-
static const uint32_t y800[2] = { fourcc('Y','8','0','0'), 0 };
|
1109
|
-
errinfo_t *errdst;
|
1110
|
-
const uint32_t *srcs, *dsts;
|
1111
|
-
unsigned min_cost = -1;
|
1112
|
-
uint32_t min_fmt = 0;
|
1113
|
-
const uint32_t *fmt;
|
1114
|
-
|
1115
|
-
if(!vdo && !win)
|
1116
|
-
return(0);
|
1117
|
-
|
1118
|
-
if(win)
|
1119
|
-
(void)window_lock(win);
|
1120
|
-
|
1121
|
-
errdst = (vdo) ? &vdo->err : &win->err;
|
1122
|
-
if(verify_format_sort()) {
|
1123
|
-
if(win)
|
1124
|
-
(void)window_unlock(win);
|
1125
|
-
return(err_capture(errdst, SEV_FATAL, ZBAR_ERR_INTERNAL, __func__,
|
1126
|
-
"image format list is not sorted!?"));
|
1127
|
-
}
|
1128
|
-
|
1129
|
-
if((vdo && !vdo->formats) || (win && !win->formats)) {
|
1130
|
-
if(win)
|
1131
|
-
(void)window_unlock(win);
|
1132
|
-
return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
|
1133
|
-
"no input or output formats available"));
|
1134
|
-
}
|
1135
|
-
|
1136
|
-
srcs = (vdo) ? vdo->formats : y800;
|
1137
|
-
dsts = (win) ? win->formats : y800;
|
1138
|
-
|
1139
|
-
for(fmt = _zbar_formats; *fmt; fmt++) {
|
1140
|
-
/* only consider formats supported by video device */
|
1141
|
-
uint32_t win_fmt = 0;
|
1142
|
-
int cost;
|
1143
|
-
if(!has_format(*fmt, srcs))
|
1144
|
-
continue;
|
1145
|
-
cost = _zbar_best_format(*fmt, &win_fmt, dsts);
|
1146
|
-
if(cost < 0) {
|
1147
|
-
zprintf(4, "%.4s(%08" PRIx32 ") -> ? (unsupported)\n",
|
1148
|
-
(char*)fmt, *fmt);
|
1149
|
-
continue;
|
1150
|
-
}
|
1151
|
-
zprintf(4, "%.4s(%08" PRIx32 ") -> %.4s(%08" PRIx32 ") (%d)\n",
|
1152
|
-
(char*)fmt, *fmt, (char*)&win_fmt, win_fmt, cost);
|
1153
|
-
if(min_cost > cost) {
|
1154
|
-
min_cost = cost;
|
1155
|
-
min_fmt = *fmt;
|
1156
|
-
if(!cost)
|
1157
|
-
break;
|
1158
|
-
}
|
1159
|
-
}
|
1160
|
-
if(win)
|
1161
|
-
(void)window_unlock(win);
|
1162
|
-
|
1163
|
-
if(!min_fmt)
|
1164
|
-
return(err_capture(errdst, SEV_ERROR, ZBAR_ERR_UNSUPPORTED, __func__,
|
1165
|
-
"no supported image formats available"));
|
1166
|
-
if(!vdo)
|
1167
|
-
return(0);
|
1168
|
-
|
1169
|
-
zprintf(2, "setting best format %.4s(%08" PRIx32 ") (%d)\n",
|
1170
|
-
(char*)&min_fmt, min_fmt, min_cost);
|
1171
|
-
return(zbar_video_init(vdo, min_fmt));
|
1172
|
-
}
|