[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
ftylitak
ftylitak at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Aug 4 01:31:21 UTC 2010
The following commit has been merged in the upstream branch:
commit 81300751400ae153a892e0f046cb6e1801537c57
Author: ftylitak <ftylitak at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Tue May 4 23:28:04 2010 +0000
git-svn-id: http://zxing.googlecode.com/svn/trunk@1336 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/symbian/ZXingBarcodeReader/.cproject b/symbian/ZXingBarcodeReader/.cproject
index 14100f3..d580a2c 100644
--- a/symbian/ZXingBarcodeReader/.cproject
+++ b/symbian/ZXingBarcodeReader/.cproject
@@ -26,9 +26,10 @@
<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>
</storageModule>
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\CameraWrapperExample.mmp;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EXE__;__S60_3X__;__SERIES60_3X__;__S60_5X__;__CW32__;__WINS__;__WINSCW__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272924381505" useMmpMacrosCache="true"/>
+<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EXE__;__S60_3X__;__SERIES60_3X__;__S60_5X__;__CW32__;__WINS__;__WINSCW__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065464" useMmpMacrosCache="true"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
<cconfiguration id="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]">
<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]">
@@ -53,9 +54,10 @@
<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>
</storageModule>
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\CameraWrapperExample.mmp;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272924381514" useMmpMacrosCache="true"/>
+<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065481" useMmpMacrosCache="true"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
<cconfiguration id="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]">
<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]">
@@ -80,9 +82,10 @@
<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>
</storageModule>
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\CameraWrapperExample.mmp;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272924381522" useMmpMacrosCache="true"/>
+<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065495" useMmpMacrosCache="true"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
<cconfiguration id="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]">
<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]">
@@ -108,9 +111,10 @@
<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>
</storageModule>
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\CameraWrapperExample.mmp;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;_DEBUG;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272924381542" useMmpMacrosCache="true"/>
+<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;_DEBUG;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065514" useMmpMacrosCache="true"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
<cconfiguration id="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]">
<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]">
@@ -135,9 +139,10 @@
<ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>
<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>
</storageModule>
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\CameraWrapperExample.mmp;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272924381550" useMmpMacrosCache="true"/>
+<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065527" useMmpMacrosCache="true"/>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cconfiguration>
</storageModule>
</cproject>
diff --git a/symbian/ZXingBarcodeReader/changes.txt b/symbian/ZXingBarcodeReader/changes.txt
new file mode 100644
index 0000000..581ebef
--- /dev/null
+++ b/symbian/ZXingBarcodeReader/changes.txt
@@ -0,0 +1,3 @@
+DecodeButStreamParser.cpp : line 68 : iconv(cd, (const char**)&fromPtr, &nFrom, &toPtr, &nTo);
+EAN13Reader.cpp : line 81 : resultString.insert((size_t)0, (size_t)1, (char) ('0' + d));
+UPCEReader.cpp : line 93 : resultString.insert((size_t)0, (size_t)1, (char) ('0' + numSys));
diff --git a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
index 1b8eeb2..3e5d83f 100644
--- a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
+++ b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
@@ -12,7 +12,7 @@ NAME CAME // 4 letter ID
#include <avkon.rsg>
#include <avkon.rh>
#include <appinfo.rh>
-#include "CameraWrapperExample.hrh"
+#include "ZXingBarcodeReader.hrh"
#include "ZXingBarcodeReader.rls"
// RESOURCE DEFINITIONS
diff --git a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader_reg.rss b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader_reg.rss
index 24fdbab..b3cb7fd 100644
--- a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader_reg.rss
+++ b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader_reg.rss
@@ -2,7 +2,7 @@
* Copyright (c) 2009 Nokia Corporation.
*/
-#include "CameraWrapperExample.hrh"
+#include "ZXingBarcodeReader.hrh"
#include "ZXingBarcodeReader.rls"
#include <appinfo.rh>
#include <ZXingBarcodeReader_0xEF24C10A.rsg>
diff --git a/symbian/ZXingBarcodeReader/group/CameraWrapperExample.mmp b/symbian/ZXingBarcodeReader/group/ZXingBarcodeReader.mmp
similarity index 87%
rename from symbian/ZXingBarcodeReader/group/CameraWrapperExample.mmp
rename to symbian/ZXingBarcodeReader/group/ZXingBarcodeReader.mmp
index 1ee5a11..4d384e0 100644
--- a/symbian/ZXingBarcodeReader/group/CameraWrapperExample.mmp
+++ b/symbian/ZXingBarcodeReader/group/ZXingBarcodeReader.mmp
@@ -38,12 +38,10 @@ SYSTEMINCLUDE zxing/qrcode/decoder
SYSTEMINCLUDE zxing/qrcode/detector
SOURCEPATH ../src
-SOURCE CameraWrapperExample.cpp
-SOURCE CameraWrapperExampleApplication.cpp
-SOURCE CameraWrapperExampleAppView.cpp
-SOURCE CameraWrapperExampleAppUi.cpp
-SOURCE CameraWrapperExampleDocument.cpp
-SOURCE CameraImage.cpp
+SOURCE ZXingBarcodeReader.cpp
+SOURCE ZXingBarcodeReaderApplication.cpp ZXingBarcodeReaderAppView.cpp
+SOURCE ZXingBarcodeReaderAppUi.cpp ZXingBarcodeReaderDocument.cpp CameraImage.cpp
+SOURCE DecodingOperations.cpp
LIBRARY euser.lib
LIBRARY apparc.lib
@@ -87,5 +85,4 @@ OPTION CW -wchar_t on
OPTION ARMCC --visibility_inlines_hidden
OPTION GCCE -fvisibility-inlines-hidden
-SOURCEPATH ../src
-SOURCE DecodingOperations.cpp
+
diff --git a/symbian/ZXingBarcodeReader/group/bld.inf b/symbian/ZXingBarcodeReader/group/bld.inf
index c196b50..df5754c 100644
--- a/symbian/ZXingBarcodeReader/group/bld.inf
+++ b/symbian/ZXingBarcodeReader/group/bld.inf
@@ -7,5 +7,5 @@ WINSCW GCCE ARMV5
PRJ_MMPFILES
gnumakefile icons_scalable_dc.mk
-CameraWrapperExample.mmp
+ZXingBarcodeReader.mmp
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExample.hrh b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReader.hrh
similarity index 100%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExample.hrh
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReader.hrh
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExample.pan b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReader.pan
similarity index 100%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExample.pan
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReader.pan
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppUi.h b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppUi.h
similarity index 86%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppUi.h
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppUi.h
index 1efab67..621bb05 100644
--- a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppUi.h
+++ b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppUi.h
@@ -36,17 +36,17 @@ const TUint KCameraShutterKeyEventCodes[6] = {
// FORWARD DECLARATIONS
-class CCameraWrapperExampleAppView;
+class CZXingBarcodeReaderAppView;
// CLASS DECLARATION
-class CCameraWrapperExampleAppUi : public CAknAppUi,
+class CZXingBarcodeReaderAppUi : public CAknAppUi,
public MCoeForegroundObserver
{
public:
// Constructors and destructor
void ConstructL ();
- CCameraWrapperExampleAppUi ();
- virtual ~CCameraWrapperExampleAppUi ();
+ CZXingBarcodeReaderAppUi ();
+ virtual ~CZXingBarcodeReaderAppUi ();
private:
TKeyResponse HandleKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType);
@@ -68,7 +68,7 @@ class CCameraWrapperExampleAppUi : public CAknAppUi,
private:
// Data
- CCameraWrapperExampleAppView* iAppView;
+ CZXingBarcodeReaderAppView* iAppView;
RArray<TInt32> iShutterKeyHandles;
TBool iCameraKeyCaptured;
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppView.h b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
similarity index 86%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppView.h
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
index be7f364..a36191d 100644
--- a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleAppView.h
+++ b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
@@ -15,17 +15,17 @@
#include <e32base.h>
#include <string>
-class CCameraWrapperExampleAppUi;
+class CZXingBarcodeReaderAppUi;
// CLASS DECLARATION
-class CCameraWrapperExampleAppView :
+class CZXingBarcodeReaderAppView :
public CCoeControl, public MCameraEngineObserver
{
public:
// Constructors
- static CCameraWrapperExampleAppView* NewL (const TRect& aRect );
- static CCameraWrapperExampleAppView* NewLC (const TRect& aRect );
- virtual ~CCameraWrapperExampleAppView ();
+ static CZXingBarcodeReaderAppView* NewL (const TRect& aRect );
+ static CZXingBarcodeReaderAppView* NewLC (const TRect& aRect );
+ virtual ~CZXingBarcodeReaderAppView ();
private:
// Functions from base classes
@@ -57,7 +57,7 @@ public CCoeControl, public MCameraEngineObserver
private:
// Constructors
void ConstructL (const TRect& aRect );
- CCameraWrapperExampleAppView ();
+ CZXingBarcodeReaderAppView ();
public:
void decodeBackbufferImage();
@@ -74,7 +74,7 @@ public CCoeControl, public MCameraEngineObserver
private:
// Data
- CCameraWrapperExampleAppUi* iAppUi;
+ CZXingBarcodeReaderAppUi* iAppUi;
// CameraWrapper class
CCameraEngine* iCameraWrapper;
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleApplication.h b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderApplication.h
similarity index 82%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExampleApplication.h
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderApplication.h
index 3b6d4a6..308c91e 100644
--- a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleApplication.h
+++ b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderApplication.h
@@ -7,7 +7,7 @@
// INCLUDES
#include <aknapp.h>
-#include "CameraWrapperExample.hrh"
+#include "ZXingBarcodeReader.hrh"
// UID for the application;
// this should correspond to the uid defined in the mmp file
@@ -18,7 +18,7 @@ const TUid KUidCameraWrapperExampleApp =
// CLASS DECLARATION
-class CCameraWrapperExampleApplication : public CAknApplication
+class CZXingBarcodeReaderApplication : public CAknApplication
{
public:
// Functions from base classes
diff --git a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleDocument.h b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderDocument.h
similarity index 58%
rename from symbian/ZXingBarcodeReader/inc/CameraWrapperExampleDocument.h
rename to symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderDocument.h
index e0f2c3a..95ce99d 100644
--- a/symbian/ZXingBarcodeReader/inc/CameraWrapperExampleDocument.h
+++ b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderDocument.h
@@ -9,17 +9,17 @@
#include <akndoc.h>
// FORWARD DECLARATIONS
-class CCameraWrapperExampleAppUi;
+class CZXingBarcodeReaderAppUi;
class CEikApplication;
// CLASS DECLARATION
-class CCameraWrapperExampleDocument : public CAknDocument
+class CZXingBarcodeReaderDocument : public CAknDocument
{
public:
// Constructors and destructor
- static CCameraWrapperExampleDocument* NewL (CEikApplication& aApp );
- static CCameraWrapperExampleDocument* NewLC (CEikApplication& aApp );
- virtual ~CCameraWrapperExampleDocument ();
+ static CZXingBarcodeReaderDocument* NewL (CEikApplication& aApp );
+ static CZXingBarcodeReaderDocument* NewLC (CEikApplication& aApp );
+ virtual ~CZXingBarcodeReaderDocument ();
public:
// Functions from base classes
@@ -28,7 +28,7 @@ class CCameraWrapperExampleDocument : public CAknDocument
private:
// Constructors
void ConstructL ();
- CCameraWrapperExampleDocument (CEikApplication& aApp );
+ CZXingBarcodeReaderDocument (CEikApplication& aApp );
private:
// Data
diff --git a/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx b/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx
index fc5a929..7c089af 100644
Binary files a/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx and b/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx differ
diff --git a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleDocument.cpp b/symbian/ZXingBarcodeReader/src/CameraWrapperExampleDocument.cpp
deleted file mode 100644
index 0b0e2c3..0000000
--- a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleDocument.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2009 Nokia Corporation.
- */
-
-// INCLUDE FILES
-#include "CameraWrapperExampleAppUi.h"
-#include "CameraWrapperExampleDocument.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-CCameraWrapperExampleDocument* CCameraWrapperExampleDocument::NewL (
- CEikApplication& aApp )
- {
- CCameraWrapperExampleDocument* self = NewLC (aApp );
- CleanupStack::Pop (self );
- return self;
- }
-
-CCameraWrapperExampleDocument* CCameraWrapperExampleDocument::NewLC (
- CEikApplication& aApp )
- {
- CCameraWrapperExampleDocument* self =
- new (ELeave) CCameraWrapperExampleDocument (aApp );
-
- CleanupStack::PushL (self );
- self->ConstructL ();
- return self;
- }
-
-void CCameraWrapperExampleDocument::ConstructL ()
- {
- }
-
-CCameraWrapperExampleDocument::CCameraWrapperExampleDocument (
- CEikApplication& aApp ) :
- CAknDocument (aApp )
- {
- }
-
-CCameraWrapperExampleDocument::~CCameraWrapperExampleDocument ()
- {
- }
-
-CEikAppUi* CCameraWrapperExampleDocument::CreateAppUiL ()
- {
- return new (ELeave) CCameraWrapperExampleAppUi;
- }
-
-// End of File
diff --git a/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp b/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
index 56bfe41..5ea8016 100644
--- a/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
+++ b/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
@@ -1,4 +1,4 @@
-#include "CameraWrapperExampleAppView.h"
+#include "ZXingBarcodeReaderAppView.h"
#include <e32std.h>
#include <zxing/qrcode/QRCodeReader.h>
@@ -12,26 +12,26 @@
using namespace zxing;
using namespace zxing::qrcode;
-void CCameraWrapperExampleAppView::StartTimer()
+void CZXingBarcodeReaderAppView::StartTimer()
{
const TInt tickInterval=2000000;
iPeriodic=CPeriodic::NewL(0); // neutral priority
//CleanupStack::PushL(iPeriodic);
- iPeriodic->Start(tickInterval,tickInterval,TCallBack(&CCameraWrapperExampleAppView::Tick, this));
+ iPeriodic->Start(tickInterval,tickInterval,TCallBack(&CZXingBarcodeReaderAppView::Tick, this));
// CleanupStack::PopAndDestroy(iPeriodic);
}
-TInt CCameraWrapperExampleAppView::Tick(TAny* aObject)
+TInt CZXingBarcodeReaderAppView::Tick(TAny* aObject)
{
// cast, and call non-static function
- ((CCameraWrapperExampleAppView*)aObject)->decodeBackbufferImage();
+ ((CZXingBarcodeReaderAppView*)aObject)->decodeBackbufferImage();
return 1;
}
-void CCameraWrapperExampleAppView::decodeBackbufferImage()
+void CZXingBarcodeReaderAppView::decodeBackbufferImage()
{
QRCodeReader decoder;
@@ -75,7 +75,7 @@ void CCameraWrapperExampleAppView::decodeBackbufferImage()
}
}
-void CCameraWrapperExampleAppView::ShowResultL(TDesC16& message)
+void CZXingBarcodeReaderAppView::ShowResultL(TDesC16& message)
{
if (!iNote)
{
diff --git a/symbian/ZXingBarcodeReader/src/CameraWrapperExample.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReader.cpp
similarity index 67%
rename from symbian/ZXingBarcodeReader/src/CameraWrapperExample.cpp
rename to symbian/ZXingBarcodeReader/src/ZXingBarcodeReader.cpp
index 4ec789d..3f01463 100644
--- a/symbian/ZXingBarcodeReader/src/CameraWrapperExample.cpp
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReader.cpp
@@ -4,11 +4,11 @@
// INCLUDE FILES
#include <eikstart.h>
-#include "CameraWrapperExampleApplication.h"
+#include "ZXingBarcodeReaderApplication.h"
LOCAL_C CApaApplication* NewApplication ()
{
- return new CCameraWrapperExampleApplication;
+ return new CZXingBarcodeReaderApplication;
}
GLDEF_C TInt E32Main ()
diff --git a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppUi.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppUi.cpp
similarity index 83%
rename from symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppUi.cpp
rename to symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppUi.cpp
index 585c031..b7ff2cf 100644
--- a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppUi.cpp
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppUi.cpp
@@ -10,16 +10,16 @@
#include <eikenv.h>
#include <ZXingBarcodeReader_0xEF24C10A.rsg>
-#include "CameraWrapperExample.hrh"
-#include "CameraWrapperExample.pan"
-#include "CameraWrapperExampleApplication.h"
-#include "CameraWrapperExampleAppUi.h"
-#include "CameraWrapperExampleAppView.h"
+#include "ZXingBarcodeReader.hrh"
+#include "ZXingBarcodeReader.pan"
+#include "ZXingBarcodeReaderApplication.h"
+#include "ZXingBarcodeReaderAppUi.h"
+#include "ZXingBarcodeReaderAppView.h"
// ============================ MEMBER FUNCTIONS ===============================
-void CCameraWrapperExampleAppUi::ConstructL ()
+void CZXingBarcodeReaderAppUi::ConstructL ()
{
// Initialise app UI with standard value.
BaseConstructL (CAknAppUi::EAknEnableSkin );
@@ -33,14 +33,14 @@ void CCameraWrapperExampleAppUi::ConstructL ()
iEikonEnv->AddForegroundObserverL(*this);
// Create view
- iAppView = CCameraWrapperExampleAppView::NewL (ClientRect () );
+ iAppView = CZXingBarcodeReaderAppView::NewL (ClientRect () );
}
-CCameraWrapperExampleAppUi::CCameraWrapperExampleAppUi ()
+CZXingBarcodeReaderAppUi::CZXingBarcodeReaderAppUi ()
{
}
-CCameraWrapperExampleAppUi::~CCameraWrapperExampleAppUi ()
+CZXingBarcodeReaderAppUi::~CZXingBarcodeReaderAppUi ()
{
delete iAppView;
@@ -53,7 +53,7 @@ CCameraWrapperExampleAppUi::~CCameraWrapperExampleAppUi ()
#ifdef ENABLE_CAMERA_SHUTTER
-void CCameraWrapperExampleAppUi::CaptureCameraShutter(TBool aEnable)
+void CZXingBarcodeReaderAppUi::CaptureCameraShutter(TBool aEnable)
{
// Try to capture events from the camera shutter key(s)
// http://wiki.forum.nokia.com/index.php/KIS000563_-_Camera_shutter_key_(EKeyCamera_events)_cannot_be_used_in_3rd_party_applications
@@ -89,7 +89,7 @@ void CCameraWrapperExampleAppUi::CaptureCameraShutter(TBool aEnable)
#endif
-void CCameraWrapperExampleAppUi::HandleGainingForeground()
+void CZXingBarcodeReaderAppUi::HandleGainingForeground()
{
// Application gets focused so reserve the camera
// http://wiki.forum.nokia.com/index.php/CS000821_-_Handling_Camera_resource
@@ -105,7 +105,7 @@ void CCameraWrapperExampleAppUi::HandleGainingForeground()
}
}
-void CCameraWrapperExampleAppUi::HandleLosingForeground()
+void CZXingBarcodeReaderAppUi::HandleLosingForeground()
{
// Application loses focus so release the camera
// http://wiki.forum.nokia.com/index.php/CS000821_-_Handling_Camera_resource
@@ -121,7 +121,7 @@ void CCameraWrapperExampleAppUi::HandleLosingForeground()
}
}
-void CCameraWrapperExampleAppUi::UseOptionsExitCbaL()
+void CZXingBarcodeReaderAppUi::UseOptionsExitCbaL()
{
CEikButtonGroupContainer* cba = Cba();
if (cba)
@@ -131,7 +131,7 @@ void CCameraWrapperExampleAppUi::UseOptionsExitCbaL()
}
}
-void CCameraWrapperExampleAppUi::UseOptionsBackCbaL()
+void CZXingBarcodeReaderAppUi::UseOptionsBackCbaL()
{
CEikButtonGroupContainer* cba = Cba();
if (cba)
@@ -141,7 +141,7 @@ void CCameraWrapperExampleAppUi::UseOptionsBackCbaL()
}
}
-TBool CCameraWrapperExampleAppUi::IsBackCBA()
+TBool CZXingBarcodeReaderAppUi::IsBackCBA()
{
CEikButtonGroupContainer* cba = Cba();
// NOTE: There should be EAknSoftkeyBack in the application because
@@ -154,7 +154,7 @@ TBool CCameraWrapperExampleAppUi::IsBackCBA()
return EFalse;
}
-TKeyResponse CCameraWrapperExampleAppUi::HandleKeyEventL(
+TKeyResponse CZXingBarcodeReaderAppUi::HandleKeyEventL(
const TKeyEvent& aKeyEvent,TEventCode aType)
{
// Capture picture with selection key
@@ -205,7 +205,7 @@ TKeyResponse CCameraWrapperExampleAppUi::HandleKeyEventL(
return EKeyWasNotConsumed;
}
-void CCameraWrapperExampleAppUi::HandleCommandL (TInt aCommand )
+void CZXingBarcodeReaderAppUi::HandleCommandL (TInt aCommand )
{
switch (aCommand )
{
@@ -241,7 +241,7 @@ void CCameraWrapperExampleAppUi::HandleCommandL (TInt aCommand )
};
}
-void CCameraWrapperExampleAppUi::HandleResourceChangeL(TInt aType)
+void CZXingBarcodeReaderAppUi::HandleResourceChangeL(TInt aType)
{
CAknAppUi::HandleResourceChangeL( aType );
diff --git a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppView.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
similarity index 79%
rename from symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppView.cpp
rename to symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
index 66daa89..77dcec8 100644
--- a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleAppView.cpp
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
@@ -9,36 +9,36 @@
#include <pathinfo.h>
#include <f32file.h>
#include <BAUTILS.H>
-#include "CameraWrapperExampleAppView.h"
-#include "CameraWrapperExampleAppUi.h"
+#include "ZXingBarcodeReaderAppView.h"
+#include "ZXingBarcodeReaderAppUi.h"
// ============================ MEMBER FUNCTIONS ===============================
-CCameraWrapperExampleAppView* CCameraWrapperExampleAppView::NewL (const TRect& aRect )
+CZXingBarcodeReaderAppView* CZXingBarcodeReaderAppView::NewL (const TRect& aRect )
{
- CCameraWrapperExampleAppView* self = CCameraWrapperExampleAppView::NewLC (aRect );
+ CZXingBarcodeReaderAppView* self = CZXingBarcodeReaderAppView::NewLC (aRect );
CleanupStack::Pop (self );
return self;
}
-CCameraWrapperExampleAppView* CCameraWrapperExampleAppView::NewLC (const TRect& aRect )
+CZXingBarcodeReaderAppView* CZXingBarcodeReaderAppView::NewLC (const TRect& aRect )
{
- CCameraWrapperExampleAppView* self = new (ELeave) CCameraWrapperExampleAppView;
+ CZXingBarcodeReaderAppView* self = new (ELeave) CZXingBarcodeReaderAppView;
CleanupStack::PushL (self );
self->ConstructL (aRect );
return self;
}
-void CCameraWrapperExampleAppView::ConstructL (const TRect& aRect )
+void CZXingBarcodeReaderAppView::ConstructL (const TRect& aRect )
{
// Create a window for this application view
CreateWindowL ();
iTitleFont = AknLayoutUtils::FontFromId(EAknLogicalFontPrimarySmallFont);
- iAppUi = static_cast<CCameraWrapperExampleAppUi*>(iEikonEnv->EikAppUi());
+ iAppUi = static_cast<CZXingBarcodeReaderAppUi*>(iEikonEnv->EikAppUi());
// Set the windows size
SetRect (aRect );
@@ -50,11 +50,11 @@ void CCameraWrapperExampleAppView::ConstructL (const TRect& aRect )
ActivateL ();
}
-CCameraWrapperExampleAppView::CCameraWrapperExampleAppView () : iPeriodic(NULL)
+CZXingBarcodeReaderAppView::CZXingBarcodeReaderAppView () : iPeriodic(NULL)
{
}
-CCameraWrapperExampleAppView::~CCameraWrapperExampleAppView ()
+CZXingBarcodeReaderAppView::~CZXingBarcodeReaderAppView ()
{
if (iCameraWrapper)
{
@@ -66,7 +66,7 @@ CCameraWrapperExampleAppView::~CCameraWrapperExampleAppView ()
ReleaseBackBuffer();
}
-TKeyResponse CCameraWrapperExampleAppView::OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType)
+TKeyResponse CZXingBarcodeReaderAppView::OfferKeyEventL(const TKeyEvent& aKeyEvent,TEventCode aType)
{
switch ( aKeyEvent.iCode )
{
@@ -143,7 +143,7 @@ TKeyResponse CCameraWrapperExampleAppView::OfferKeyEventL(const TKeyEvent& aKeyE
return EKeyWasNotConsumed;
}
-void CCameraWrapperExampleAppView::CancelCapturedPicture(TBool aCleanTexts)
+void CZXingBarcodeReaderAppView::CancelCapturedPicture(TBool aCleanTexts)
{
if (iCameraWrapper && iCameraWrapper->State() == CCameraEngine::EEngineIdle)
{
@@ -162,7 +162,7 @@ void CCameraWrapperExampleAppView::CancelCapturedPicture(TBool aCleanTexts)
}
}
-void CCameraWrapperExampleAppView::Draw(const TRect& /*aRect*/) const
+void CZXingBarcodeReaderAppView::Draw(const TRect& /*aRect*/) const
{
CWindowGc& gc = SystemGc ();
@@ -180,7 +180,7 @@ void CCameraWrapperExampleAppView::Draw(const TRect& /*aRect*/) const
}
}
-void CCameraWrapperExampleAppView::DrawTexts(CWindowGc& gc) const
+void CZXingBarcodeReaderAppView::DrawTexts(CWindowGc& gc) const
{
if (iTitle.Length()>0)
{
@@ -192,7 +192,7 @@ void CCameraWrapperExampleAppView::DrawTexts(CWindowGc& gc) const
}
}
-void CCameraWrapperExampleAppView::SizeChanged()
+void CZXingBarcodeReaderAppView::SizeChanged()
{
// Create camera wrapper class here because
// whole camera wrapper and all handles have to reset
@@ -244,7 +244,7 @@ void CCameraWrapperExampleAppView::SizeChanged()
}
}
-void CCameraWrapperExampleAppView::HandlePointerEventL (
+void CZXingBarcodeReaderAppView::HandlePointerEventL (
const TPointerEvent& aPointerEvent )
{
if (aPointerEvent.iType == TPointerEvent::EButton1Down)
@@ -267,25 +267,25 @@ void CCameraWrapperExampleAppView::HandlePointerEventL (
}
}
-void CCameraWrapperExampleAppView::SetTitle(const TDesC& aTitle)
+void CZXingBarcodeReaderAppView::SetTitle(const TDesC& aTitle)
{
iTitle.Copy(aTitle);
DrawNow();
}
-void CCameraWrapperExampleAppView::SetError( const TDesC& aMsg, TInt aVal )
+void CZXingBarcodeReaderAppView::SetError( const TDesC& aMsg, TInt aVal )
{
iTitle.Format(aMsg, aVal);
DrawNow();
}
-void CCameraWrapperExampleAppView::SetError( const TDesC& aMsg, TInt aVal1, TInt aVal2 )
+void CZXingBarcodeReaderAppView::SetError( const TDesC& aMsg, TInt aVal1, TInt aVal2 )
{
iTitle.Format(aMsg, aVal1, aVal2);
DrawNow();
}
-void CCameraWrapperExampleAppView::CreateBackBufferL()
+void CZXingBarcodeReaderAppView::CreateBackBufferL()
{
// create back buffer bitmap
iBackBuffer = new (ELeave) CFbsBitmap;
@@ -301,7 +301,7 @@ void CCameraWrapperExampleAppView::CreateBackBufferL()
iBackBufferContext->Clear();
}
-void CCameraWrapperExampleAppView::ReleaseBackBuffer()
+void CZXingBarcodeReaderAppView::ReleaseBackBuffer()
{
if (iBackBufferContext)
{
@@ -320,7 +320,7 @@ void CCameraWrapperExampleAppView::ReleaseBackBuffer()
}
}
-void CCameraWrapperExampleAppView::MceoCameraReady()
+void CZXingBarcodeReaderAppView::MceoCameraReady()
{
iAppUi->UseOptionsExitCbaL();
@@ -346,7 +346,7 @@ void CCameraWrapperExampleAppView::MceoCameraReady()
}
}
-void CCameraWrapperExampleAppView::Capture()
+void CZXingBarcodeReaderAppView::Capture()
{
// This method is called when picture is focused with camera shutter and pressed whole down
// as taking a new picture
@@ -365,7 +365,7 @@ void CCameraWrapperExampleAppView::Capture()
#endif
}
-void CCameraWrapperExampleAppView::StartFocusing()
+void CZXingBarcodeReaderAppView::StartFocusing()
{
if (iCameraWrapper && iCameraWrapper->State() == CCameraEngine::EEngineViewFinding)
{
@@ -389,7 +389,7 @@ void CCameraWrapperExampleAppView::StartFocusing()
}
}
-void CCameraWrapperExampleAppView::MceoFocusComplete()
+void CZXingBarcodeReaderAppView::MceoFocusComplete()
{
// CameraEngine state is EEngineIdle
SetTitle(_L("Focused"));
@@ -397,7 +397,7 @@ void CCameraWrapperExampleAppView::MceoFocusComplete()
if (iCameraShutterFocusing)
{
// Leave as focused. User must press whole camera shutter down for capturing
- // then CCameraWrapperExampleAppView::Capture() is called
+ // then CZXingBarcodeReaderAppView::Capture() is called
}
else
{
@@ -411,7 +411,7 @@ void CCameraWrapperExampleAppView::MceoFocusComplete()
}
}
-void CCameraWrapperExampleAppView::MceoCapturedDataReady( TDesC8* aData )
+void CZXingBarcodeReaderAppView::MceoCapturedDataReady( TDesC8* aData )
{
SetTitle(_L("Saving picture..."));
@@ -426,7 +426,7 @@ void CCameraWrapperExampleAppView::MceoCapturedDataReady( TDesC8* aData )
StorePicture(iData);
}
-void CCameraWrapperExampleAppView::StorePicture( TDesC8* aData )
+void CZXingBarcodeReaderAppView::StorePicture( TDesC8* aData )
{
// Create path for filename
TFileName path = PathInfo::PhoneMemoryRootPath();
@@ -474,7 +474,7 @@ void CCameraWrapperExampleAppView::StorePicture( TDesC8* aData )
}
-void CCameraWrapperExampleAppView::MceoCapturedBitmapReady( CFbsBitmap* aBitmap )
+void CZXingBarcodeReaderAppView::MceoCapturedBitmapReady( CFbsBitmap* aBitmap )
{
if (iBackBufferContext)
{
@@ -493,7 +493,7 @@ void CCameraWrapperExampleAppView::MceoCapturedBitmapReady( CFbsBitmap* aBitmap
iCameraWrapper->ReleaseImageBuffer();
}
-void CCameraWrapperExampleAppView::MceoViewFinderFrameReady( CFbsBitmap& aFrame )
+void CZXingBarcodeReaderAppView::MceoViewFinderFrameReady( CFbsBitmap& aFrame )
{
if (iBackBufferContext)
{
@@ -512,7 +512,7 @@ void CCameraWrapperExampleAppView::MceoViewFinderFrameReady( CFbsBitmap& aFrame
iCameraWrapper->ReleaseViewFinderBuffer();
}
-void CCameraWrapperExampleAppView::MceoHandleError( TCameraEngineError aErrorType, TInt aError )
+void CZXingBarcodeReaderAppView::MceoHandleError( TCameraEngineError aErrorType, TInt aError )
{
// NOTE: CameraEngine state seems to go into CCameraEngine::EEngineIdle state
@@ -565,7 +565,7 @@ void CCameraWrapperExampleAppView::MceoHandleError( TCameraEngineError aErrorTyp
iAppUi->UseOptionsExitCbaL();
}
-void CCameraWrapperExampleAppView::MceoHandleOtherEvent( const TECAMEvent& /*aEvent*/ )
+void CZXingBarcodeReaderAppView::MceoHandleOtherEvent( const TECAMEvent& /*aEvent*/ )
{
}
diff --git a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleApplication.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderApplication.cpp
similarity index 52%
rename from symbian/ZXingBarcodeReader/src/CameraWrapperExampleApplication.cpp
rename to symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderApplication.cpp
index 5542e47..5ae632f 100644
--- a/symbian/ZXingBarcodeReader/src/CameraWrapperExampleApplication.cpp
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderApplication.cpp
@@ -3,19 +3,19 @@
*/
// INCLUDE FILES
-#include "CameraWrapperExample.hrh"
-#include "CameraWrapperExampleDocument.h"
-#include "CameraWrapperExampleApplication.h"
+#include "ZXingBarcodeReader.hrh"
+#include "ZXingBarcodeReaderDocument.h"
+#include "ZXingBarcodeReaderApplication.h"
// ============================ MEMBER FUNCTIONS ===============================
-CApaDocument* CCameraWrapperExampleApplication::CreateDocumentL ()
+CApaDocument* CZXingBarcodeReaderApplication::CreateDocumentL ()
{
// Create an CameraWrapperExample document, and return a pointer to it
- return CCameraWrapperExampleDocument::NewL (*this );
+ return CZXingBarcodeReaderDocument::NewL (*this );
}
-TUid CCameraWrapperExampleApplication::AppDllUid () const
+TUid CZXingBarcodeReaderApplication::AppDllUid () const
{
// Return the UID for the CameraWrapperExample application
return KUidCameraWrapperExampleApp;
diff --git a/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderDocument.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderDocument.cpp
new file mode 100644
index 0000000..24854dc
--- /dev/null
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderDocument.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2009 Nokia Corporation.
+ */
+
+// INCLUDE FILES
+#include "ZXingBarcodeReaderAppUi.h"
+#include "ZXingBarcodeReaderDocument.h"
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+CZXingBarcodeReaderDocument* CZXingBarcodeReaderDocument::NewL (
+ CEikApplication& aApp )
+ {
+ CZXingBarcodeReaderDocument* self = NewLC (aApp );
+ CleanupStack::Pop (self );
+ return self;
+ }
+
+CZXingBarcodeReaderDocument* CZXingBarcodeReaderDocument::NewLC (
+ CEikApplication& aApp )
+ {
+ CZXingBarcodeReaderDocument* self =
+ new (ELeave) CZXingBarcodeReaderDocument (aApp );
+
+ CleanupStack::PushL (self );
+ self->ConstructL ();
+ return self;
+ }
+
+void CZXingBarcodeReaderDocument::ConstructL ()
+ {
+ }
+
+CZXingBarcodeReaderDocument::CZXingBarcodeReaderDocument (
+ CEikApplication& aApp ) :
+ CAknDocument (aApp )
+ {
+ }
+
+CZXingBarcodeReaderDocument::~CZXingBarcodeReaderDocument ()
+ {
+ }
+
+CEikAppUi* CZXingBarcodeReaderDocument::CreateAppUiL ()
+ {
+ return new (ELeave) CZXingBarcodeReaderAppUi;
+ }
+
+// End of File
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list