src/libdecodeqr/qrerror.h:

 * renamed from errorcode.h

src/libdecodeqr/libdecodeqr.mak:
 * replace japanese message to english

src/libdecodeqr/Makefile.in:
 * install qrerror.h and qrtype.h

git-svn-id: http://www.koka-in.org/svn/libdecodeqr/trunk@32 d649fbcd-581f-0410-8d75-88b9247333c5

src/libdecodeqr/Makefile.in

@@ -57,7 +57,7 @@ install: $(dsts)
 	$(INSTALL) -m 0755 $(LIBNAME_A) $(LIBNAME_SO) $(libdir)
 	$(LDCONFIG) -n $(libdir)
 	$(LN) -sf $(libdir)/$(LIBNAME_SO) $(libdir)/$(BASENAME).so
-	$(INSTALL) -m 0644 decodeqr.h $(includedir)
+	$(INSTALL) -m 0644 decodeqr.h qrerror.h qrtypes.h $(includedir)
 
 clean:
 	-rm *.a *.o *.so.*

src/libdecodeqr/codedata.h

@@ -16,7 +16,7 @@
 #include "galois.h"
 #include "bitstream.h"
 #include "ecidecoder.h"
-#include "errorcode.h"
+#include "qrerror.h"
 
 #ifndef NULL
 #define NULL 0

src/libdecodeqr/container.h

@@ -12,7 +12,7 @@
 #ifndef __QR_CONTAINER__
 #define __QR_CONTAINER__
 
-#include "errorcode.h"
+#include "qrerror.h"
 #include "formatinfo.h"
 #include "codedata.h"
 

src/libdecodeqr/decodeqr.h

@@ -13,7 +13,7 @@
 #define __QR_DECODER__
 
 #include <cv.h>
-#include "errorcode.h"
+#include "qrerror.h"
 #include "qrtypes.h"
 
 #define DEFAULT_ADAPTIVE_TH_SIZE 25

src/libdecodeqr/formatinfo.h

@@ -16,7 +16,7 @@
 #define NULL 0
 #endif
 
-#include "errorcode.h"
+#include "qrerror.h"
 #include "galois.h"
 
 #define QR_FORMAT_INFO_GX 0x537 // G(x)=x^10+x^8+x^5+x^4+x^2+x+1

src/libdecodeqr/imagereader.h

@@ -17,7 +17,7 @@
 #endif
 
 #include <cv.h>
-#include "errorcode.h"
+#include "qrerror.h"
 #include "container.h"
 
 

src/libdecodeqr/libdecodeqr.dep

@@ -5,74 +5,76 @@
 
 
 .\codedata.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\bitstream.h"\
 	".\codedata.h"\
 	".\ecidecoder.h"\
-	".\errorcode.h"\
 	".\galois.h"\
+	".\qrerror.h"\
 
 
 .\container.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\bitstream.h"\
 	".\codedata.h"\
 	".\container.h"\
 	".\ecidecoder.h"\
-	".\errorcode.h"\
 	".\formatinfo.h"\
 	".\galois.h"\
+	".\qrerror.h"\
 
 
 .\ecidecoder.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
 	".\bitstream.h"\
 	".\ecidecoder.h"\
 
 
 .\formatinfo.cpp : \
-	".\errorcode.h"\
 	".\formatinfo.h"\
 	".\galois.h"\
+	".\qrerror.h"\
 
 
 .\galois.cpp : \
 	".\galois.h"\
 
 
 .\imagereader.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cv.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cvcompat.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cvtypes.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxcore.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxerror.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxtypes.h"\
 	".\bitstream.h"\
 	".\codedata.h"\
 	".\container.h"\
 	".\ecidecoder.h"\
-	".\errorcode.h"\
 	".\formatinfo.h"\
 	".\galois.h"\
 	".\imagereader.h"\
+	".\qrerror.h"\
+	{$(INCLUDE)}"cv.h"\
+	{$(INCLUDE)}"cvcompat.h"\
+	{$(INCLUDE)}"cvtypes.h"\
+	{$(INCLUDE)}"cxcore.h"\
+	{$(INCLUDE)}"cxerror.h"\
+	{$(INCLUDE)}"cxtypes.h"\
+	{$(INCLUDE)}"emmintrin.h"\
+	{$(INCLUDE)}"mmintrin.h"\
+	{$(INCLUDE)}"xmmintrin.h"\
 
 
 .\libdecodeqr.cpp : \
-	"..\..\..\..\..\..\..\program files\microsoft visual studio\vc98\include\basetsd.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cv.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cvcompat.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cv\include\cvtypes.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxcore.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxerror.h"\
-	"..\..\..\..\..\..\..\program files\opencv\cxcore\include\cxtypes.h"\
 	".\bitstream.h"\
 	".\codedata.h"\
 	".\container.h"\
 	".\ecidecoder.h"\
-	".\errorcode.h"\
 	".\formatinfo.h"\
 	".\galois.h"\
 	".\imagereader.h"\
+	".\qrerror.h"\
 	".\qrtypes.h"\
+	".\version.h"\
+	{$(INCLUDE)}"cv.h"\
+	{$(INCLUDE)}"cvcompat.h"\
+	{$(INCLUDE)}"cvtypes.h"\
+	{$(INCLUDE)}"cxcore.h"\
+	{$(INCLUDE)}"cxerror.h"\
+	{$(INCLUDE)}"cxtypes.h"\
+	{$(INCLUDE)}"emmintrin.h"\
+	{$(INCLUDE)}"mmintrin.h"\
+	{$(INCLUDE)}"xmmintrin.h"\
 

src/libdecodeqr/libdecodeqr.mak

@@ -1,22 +1,21 @@
 # Microsoft Developer Studio Generated NMAKE File, Based on libdecodeqr.dsp
 !IF "$(CFG)" == ""
 CFG=libdecodeqr - Win32 Debug
-!MESSAGE 構成が指定されていません。ﾃﾞﾌｫﾙﾄの libdecodeqr - Win32 Debug を設定します。
+!MESSAGE Missing target. Using defualt "libdecodeqr - Win32 Debug".
 !ENDIF 
 
 !IF "$(CFG)" != "libdecodeqr - Win32 Release" && "$(CFG)" != "libdecodeqr - Win32 Debug"
-!MESSAGE 指定された ﾋﾞﾙﾄﾞ ﾓｰﾄﾞ "$(CFG)" は正しくありません。
-!MESSAGE NMAKE の実行時に構成を指定できます
-!MESSAGE ｺﾏﾝﾄﾞ ﾗｲﾝ上でﾏｸﾛの設定を定義します。例:
+!MESSAGE Mode "$(CFG)" is not valid.
 !MESSAGE 
-!MESSAGE NMAKE /f "libdecodeqr.mak" CFG="libdecodeqr - Win32 Debug"
+!MESSAGE Valid modes are:
 !MESSAGE 
-!MESSAGE 選択可能なﾋﾞﾙﾄﾞ ﾓｰﾄﾞ:
+!MESSAGE "libdecodeqr - Win32 Release" (for "Win32 (x86) Static Library")
+!MESSAGE "libdecodeqr - Win32 Debug" (for "Win32 (x86) Static Library")
 !MESSAGE 
-!MESSAGE "libdecodeqr - Win32 Release" ("Win32 (x86) Static Library" 用)
-!MESSAGE "libdecodeqr - Win32 Debug" ("Win32 (x86) Static Library" 用)
+!MESSAGE eg:
 !MESSAGE 
-!ERROR 無効な構成が指定されています。
+!MESSAGE NMAKE /f "libdecodeqr.mak" CFG="libdecodeqr - Win32 Debug"
+!ERROR Invalid target are gaven.
 !ENDIF 
 
 !IF "$(OS)" == "Windows_NT"

src/libdecodeqr/errorcode.h → src/libdecodeqr/qrerror.h

@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////
 //
-// errorcode.h --a part of libdecodeqr
+// qrerror.h --a part of libdecodeqr
 //
 // Copyright (c) 2006 NISHI Takao <zophos@koka-in.org>
 //