浏览代码

稳定性修改

蘭雅sRGB 11 月之前
父节点
当前提交
8a0a53a319

+ 29 - 0
.gitignore

@@ -0,0 +1,29 @@
+*.db
+*.user
+*.opendb
+Debug/
+Release/
+obj/
+*.html
+*.obj
+*.xml
+*.layout
+*.def
+*.layout
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib

+ 1 - 1
AdobeThumbnail.cpp

@@ -25,7 +25,7 @@ bool AdobeThumbnail(const char* adobe_filename , const char* savejpeg_filename)
     /// ************* 获取 ID或者AI文档 的预览图 **************** ///
     /// ************* 获取 ID或者AI文档 的预览图 **************** ///
     FILE* adobe_file = fopen(adobe_filename, "rb");
     FILE* adobe_file = fopen(adobe_filename, "rb");
     if(NULL == adobe_file){
     if(NULL == adobe_file){
-        MessageBoxA(NULL, adobe_filename, "错误File", MB_OK);
+    //    MessageBoxA(NULL, adobe_filename, "错误File", MB_OK);
         return false;
         return false;
     }
     }
     size_t file_size = get_fileSize(adobe_filename); // 获得文件大小
     size_t file_size = get_fileSize(adobe_filename); // 获得文件大小

+ 0 - 31
AdobeThumbnail.layout

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<FileVersion major="1" minor="0" />
-	<ActiveTarget name="Release" />
-	<File name="resource.h" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="atpch.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="164" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="coreldraw_riffinfo.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="714" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="ConsoleApp\main.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="641" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="Thumb_ico.rc" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<EditorTabsLayout layout="@layout2|name=dummy;caption=;state=2098174;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=667;besth=253;minw=667;minh=253;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(5,0,0)=202|" />
-</CodeBlocks_layout_file>

+ 0 - 95
AdobeThumbnail_build_log.html

@@ -1,95 +0,0 @@
-<html>
-<head>
-<title>AdobeThumbnail build log</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body>
-<tt>
-Build started on: <u>05-03-2016 at 23:04.41</u><br />
-Build ended on: <u>05-03-2016 at 23:04.44</u><p />
-<b>-------------- 构建: Release in AdobeThumbnail (compiler: Microsoft Visual C++ 2010)---------------</b><br />
-cl.exe /nologo /W3 /EHsc  /Ox /DNDEBUG /MT    /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c AdobeThumbnail.cpp /Foobj\Release\AdobeThumbnail.obj<br />
-cl.exe /nologo /W3 /EHsc  /Ox /DNDEBUG /MT    /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IConsoleApp /IE:\mycpp\AdobeThumbnail /c ConsoleApp\main.cpp /Foobj\Release\ConsoleApp\main.obj<br />
-AdobeThumbnail.cpp<br />
-main.cpp<br />
-e:\mycpp\adobethumbnail\AdobeThumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\AdobeThumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\AdobeThumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\corel_thumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\coreldraw_riffinfo.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-e:\mycpp\adobethumbnail\corel_thumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\coreldraw_riffinfo.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-cl.exe /nologo /W3 /EHsc  /Ox /DNDEBUG /MT    /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c corel_thumbnail.cpp /Foobj\Release\corel_thumbnail.obj<br />
-corel_thumbnail.cpp<br />
-corel_thumbnail.cpp : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\corel_thumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\coreldraw_riffinfo.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-cl.exe /nologo /W3 /EHsc  /Ox /DNDEBUG /MT    /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c coreldraw_riffinfo.cpp /Foobj\Release\coreldraw_riffinfo.obj<br />
-coreldraw_riffinfo.cpp<br />
-coreldraw_riffinfo.cpp : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-e:\mycpp\adobethumbnail\coreldraw_riffinfo.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(17) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(17) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(17) : error C2070: “'unknown-type'”: 非法的 sizeof 操作数</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2228: “.riff”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2228: “.riff”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2228: “.riff”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(19) : error C2228: “.riff”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(21) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(21) : error C2228: “.cb”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(22) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(22) : error C2228: “.version”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(30) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(30) : error C2228: “.version”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(39) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(39) : error C2065: “cdr_riff”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(39) : error C2070: “'unknown-type'”: 非法的 sizeof 操作数</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(42) : error C2065: “disp_chunk”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(42) : error C2065: “disp_chunk”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(42) : error C2070: “'unknown-type'”: 非法的 sizeof 操作数</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(45) : error C2065: “disp_chunk”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(45) : error C2228: “.cb”的左边必须有类/结构/联合</font><br />
-        类型是“'unknown-type'”<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(46) : error C2065: “disp_chunk”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(46) : error C2065: “disp_chunk”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(46) : error C2070: “'unknown-type'”: 非法的 sizeof 操作数</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(51) : error C2059: 语法错误:“if”</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(51) : error C2143: 语法错误 : 缺少“;”(在“{”的前面)</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(51) : error C2447: “{”: 缺少函数标题(是否是老式的形式表?)</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(79) : error C2059: 语法错误:“else”</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(82) : error C2065: “cdr_pfile”: 未声明的标识符</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(82) : error C4430: 缺少类型说明符 - 假定为 int。注意: C++ 不支持默认 int</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(82) : error C2365: “fclose”: 重定义;以前的定义是“函数”</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(199) : 参见“fclose”的声明<br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(83) : error C2059: 语法错误:“return”</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(84) : error C2059: 语法错误:“}”</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(84) : error C2143: 语法错误 : 缺少“;”(在“}”的前面)</font><br />
-<font color="#ff0000">coreldraw_riffinfo.cpp(84) : error C2059: 语法错误:“}”</font><br />
-<font color="#a00000">Process terminated with status 2 (0 minute(s), 2 second(s))</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(19) : error C2065: “FileInfo”: 未声明的标识符</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(131) : error C2065: “ret”: 未声明的标识符</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(133) : error C2065: “ret”: 未声明的标识符</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(149) : error C2065: “ret”: 未声明的标识符</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(151) : error C2065: “ret”: 未声明的标识符</font><br />
-<font color="#ff0000">corel_thumbnail.cpp(161) : error C2065: “ret”: 未声明的标识符</font><br />
-<font color="#a00000">Process terminated with status 2 (0 minute(s), 3 second(s))</font><br />
-<font color="#a00000">45 error(s), 6 warning(s) (0 minute(s), 3 second(s))</font><br />
-</tt>
-</body>
-</html>

+ 1 - 3
GuiAdobeThumbnail.cbp

@@ -12,6 +12,7 @@
 				<Option type="0" />
 				<Option type="0" />
 				<Option compiler="msvc10" />
 				<Option compiler="msvc10" />
 				<Compiler>
 				<Compiler>
+					<Add option="/MT" />
 					<Add option="/Os" />
 					<Add option="/Os" />
 					<Add option="/O1" />
 					<Add option="/O1" />
 					<Add option="/Zc:wchar_t-" />
 					<Add option="/Zc:wchar_t-" />
@@ -138,9 +139,6 @@
 		<Unit filename="otherapi.h" />
 		<Unit filename="otherapi.h" />
 		<Unit filename="resource.h" />
 		<Unit filename="resource.h" />
 		<Extensions>
 		<Extensions>
-			<code_completion />
-			<envvars />
-			<debugger />
 			<lib_finder disable_auto="1" />
 			<lib_finder disable_auto="1" />
 		</Extensions>
 		</Extensions>
 	</Project>
 	</Project>

+ 0 - 267
GuiAdobeThumbnail.depend

@@ -1,267 +0,0 @@
-# depslib dependency file v1.0
-1454672978 source:e:\mycpp\adobethumbnail\adobethumbnail.cpp
-	"atpch.h"
-	<regex>
-
-1457190326 e:\mycpp\adobethumbnail\atpch.h
-	"AdobeThumbnail.h"
-	"corel_thumbnail.h"
-	"otherapi.h"
-	"deAi7Thumb.h"
-
-1457190326 e:\mycpp\adobethumbnail\adobethumbnail.h
-	<iostream>
-	<sstream>
-	<fstream>
-	<string>
-	<regex>
-	<atlenc.h>
-
-1457190326 e:\mycpp\adobethumbnail\corel_thumbnail.h
-	<windows.h>
-	"coreldraw_riffinfo.h"
-	"otherapi.h"
-	"ZLib/zip.h"
-	"ZLib/unzip.h"
-
-1457190326 e:\mycpp\adobethumbnail\coreldraw_riffinfo.h
-	<windows.h>
-	<stdio.h>
-
-1454672978 e:\mycpp\adobethumbnail\otherapi.h
-	<windows.h>
-	<stdio.h>
-
-1457190326 e:\mycpp\adobethumbnail\zlib\zip.h
-	"zlib.h"
-	"ioapi.h"
-	"bzlib.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\zlib.h
-	"zconf.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\zconf.h
-	<windows.h>
-	<limits.h>
-	<sys/types.h>
-	<stdarg.h>
-	<stddef.h>
-	<unistd.h>
-	<unixio.h>
-
-1457190326 e:\mycpp\adobethumbnail\zlib\ioapi.h
-	<stdio.h>
-	<stdlib.h>
-	"zlib.h"
-	<stdint.h>
-	"mz64conf.h"
-	"stdint.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\unzip.h
-	"zlib.h"
-	"ioapi.h"
-	"bzlib.h"
-
-1457190326 e:\mycpp\adobethumbnail\deai7thumb.h
-	<string>
-	<windows.h>
-	<stdio.h>
-	<iostream>
-	<sstream>
-	<algorithm>
-
-1457190326 source:e:\mycpp\adobethumbnail\corel_thumbnail.cpp
-	"corel_thumbnail.h"
-	<regex>
-	<string>
-	<atlimage.h>
-
-1457190326 source:e:\mycpp\adobethumbnail\coreldraw_riffinfo.cpp
-
-1457190326 source:e:\mycpp\adobethumbnail\deai7thumb.cpp
-	<atlimage.h>
-
-1457193381 source:e:\mycpp\adobethumbnail\guiapp\guimain.cpp
-	"GuiMain.h"
-	<wchar.h>
-	<regex>
-	"xcgui.h"
-
-1457191914 e:\mycpp\adobethumbnail\guiapp\guimain.h
-	<windows.h>
-	<shlobj.h>
-	<Setupapi.h>
-	"resource.h"
-	<fstream>
-	"xcgui.h"
-
-1457190388 e:\mycpp\adobethumbnail\\resource.h
-
-1366284388 e:\mycpp\adobethumbnail\guiapp\xcgui.h
-	<docobj.h>
-	<exdispid.h>
-
-1454672978 source:e:\mycpp\adobethumbnail\guiapp\guithumbnail.cpp
-	<string.h>
-	<wchar.h>
-
-1454672978 source:e:\mycpp\adobethumbnail\otherapi.cpp
-	"otherapi.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\adler32.c
-	"zutil.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\zutil.h
-	"zlib.h"
-	<stddef.h>
-	<string.h>
-	<stdlib.h>
-	<alloc.h>
-	<malloc.h>
-	<malloc.h>
-	<unix.h>
-	<stdio.h>
-
-1457190466 source:e:\mycpp\adobethumbnail\thumb_ico.rc
-	<windows.h>
-	<commctrl.h>
-	<richedit.h>
-	"resource.h"
-
-1457190388 e:\mycpp\adobethumbnail\resource.h
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\compress.c
-	"zlib.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\crc32.c
-	<stdio.h>
-	"zutil.h"
-	"crc32.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\crc32.h
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\deflate.c
-	"deflate.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\deflate.h
-	"zutil.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\gzclose.c
-	"gzguts.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\gzguts.h
-	<stdio.h>
-	"zlib.h"
-	<string.h>
-	<stdlib.h>
-	<limits.h>
-	<fcntl.h>
-	<stddef.h>
-	<io.h>
-	<windows.h>
-	<errno.h>
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\gzlib.c
-	"gzguts.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\gzread.c
-	"gzguts.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\gzwrite.c
-	"gzguts.h"
-	<stdarg.h>
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\infback.c
-	"zutil.h"
-	"inftrees.h"
-	"inflate.h"
-	"inffast.h"
-	"inffixed.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\inftrees.h
-
-1457190326 e:\mycpp\adobethumbnail\zlib\inflate.h
-
-1457190326 e:\mycpp\adobethumbnail\zlib\inffast.h
-
-1457190326 e:\mycpp\adobethumbnail\zlib\inffixed.h
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\inffast.c
-	"zutil.h"
-	"inftrees.h"
-	"inflate.h"
-	"inffast.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\inflate.c
-	"zutil.h"
-	"inftrees.h"
-	"inflate.h"
-	"inffast.h"
-	"inffixed.h"
-	<stdio.h>
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\inftrees.c
-	"zutil.h"
-	"inftrees.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\ioapi.c
-	"ioapi.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\iowin32.c
-	<stdlib.h>
-	"zlib.h"
-	"ioapi.h"
-	"iowin32.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\iowin32.h
-	<windows.h>
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\mztools.c
-	<stdio.h>
-	<stdlib.h>
-	<string.h>
-	"zlib.h"
-	"unzip.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\trees.c
-	"deflate.h"
-	<ctype.h>
-	"trees.h"
-	<stdio.h>
-
-1457190326 e:\mycpp\adobethumbnail\zlib\trees.h
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\uncompr.c
-	"zlib.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\unzip.c
-	<stdio.h>
-	<stdlib.h>
-	<string.h>
-	"zlib.h"
-	"unzip.h"
-	<stddef.h>
-	<string.h>
-	<stdlib.h>
-	<errno.h>
-	"crypt.h"
-
-1457190326 e:\mycpp\adobethumbnail\zlib\crypt.h
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\zip.c
-	<stdio.h>
-	<stdlib.h>
-	<string.h>
-	<time.h>
-	"zlib.h"
-	"zip.h"
-	<stddef.h>
-	<string.h>
-	<stdlib.h>
-	<errno.h>
-	"crypt.h"
-
-1457190326 source:e:\mycpp\adobethumbnail\zlib\zutil.c
-	"zutil.h"
-	"gzguts.h"
-

+ 0 - 41
GuiAdobeThumbnail.layout

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<FileVersion major="1" minor="0" />
-	<ActiveTarget name="Release" />
-	<File name="resource.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="108" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="GuiApp\Everything.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="178" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="GuiApp\GuiMain.cpp" open="1" top="1" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="481" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="GuiApp\GuiMain.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="293" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="GuiApp\GuiThumbnail.h" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="0" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="GuiApp\xcgui.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="170207" topLine="3338" />
-		</Cursor>
-	</File>
-	<File name="Thumb_ico.rc" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="209" topLine="0" />
-		</Cursor>
-	</File>
-	<EditorTabsLayout layout="09fc33e856daf7680008c2fd00000002=0;GuiAdobeThumbnail:GuiApp\GuiThumbnail.h,*1;GuiAdobeThumbnail:GuiApp\GuiMain.cpp@layout2|name=dummy;caption=;state=2098174;dir=3;layer=0;row=0;pos=0;prop=100000;bestw=667;besth=253;minw=667;minh=253;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=09fc33e856daf7680008c2fd00000002;caption=;state=2098172;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=200;besth=200;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(5,0,0)=202|" />
-</CodeBlocks_layout_file>

+ 0 - 134
GuiAdobeThumbnail_build_log.html

@@ -1,134 +0,0 @@
-<html>
-<head>
-<title>GuiAdobeThumbnail build log</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head>
-<body>
-<tt>
-Build started on: <u>06-03-2016 at 00:38.13</u><br />
-Build ended on: <u>06-03-2016 at 00:38.18</u><p />
-<b>-------------- 构建: Release in GuiAdobeThumbnail (compiler: Microsoft Visual C++ 2010)---------------</b><br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c AdobeThumbnail.cpp /Foobj\Release\AdobeThumbnail.obj<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c corel_thumbnail.cpp /Foobj\Release\corel_thumbnail.obj<br />
-AdobeThumbnail.cpp<br />
-corel_thumbnail.cpp<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c coreldraw_riffinfo.cpp /Foobj\Release\coreldraw_riffinfo.obj<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c deAi7Thumb.cpp /Foobj\Release\deAi7Thumb.obj<br />
-coreldraw_riffinfo.cpp<br />
-deAi7Thumb.cpp<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IGuiApp /IE:\mycpp\AdobeThumbnail /c GuiApp\GuiMain.cpp /Foobj\Release\GuiApp\GuiMain.obj<br />
-GuiMain.cpp<br />
-e:\mycpp\adobethumbnail\guiapp\GuiThumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-<font color="#0000ff">deAi7Thumb.cpp(116) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-e:\mycpp\adobethumbnail\guiapp\GuiMain.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IGuiApp /IE:\mycpp\AdobeThumbnail /c GuiApp\GuiThumbnail.cpp /Foobj\Release\GuiApp\GuiThumbnail.obj<br />
-<font color="#0000ff">GuiApp\GuiMain.cpp(154) : warning C4800: “BOOL”: 将值强制为布尔值“true”或“false”(性能警告)</font><br />
-<font color="#0000ff">GuiApp\GuiMain.cpp(167) : warning C4018: “&lt;”: 有符号/无符号不匹配</font><br />
-<font color="#0000ff">GuiApp\GuiMain.cpp(282) : warning C4800: “BOOL”: 将值强制为布尔值“true”或“false”(性能警告)</font><br />
-GuiThumbnail.cpp<br />
-e:\mycpp\adobethumbnail\guiapp\GuiThumbnail.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail /c otherapi.cpp /Foobj\Release\otherapi.obj<br />
-otherapi.cpp<br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\coreldraw_riffinfo.h(46) : warning C4161: #pragma pack(pop...) : 出栈的比入栈的多</font><br />
-<font color="#0000ff">e:\mycpp\adobethumbnail\deAi7Thumb.h(4) : warning C4067: 预处理器指令后有意外标记 - 应输入换行符</font><br />
-<font color="#0000ff">GuiApp\GuiThumbnail.cpp(13) : warning C4800: “BOOL”: 将值强制为布尔值“true”或“false”(性能警告)</font><br />
-<font color="#0000ff">GuiApp\GuiThumbnail.cpp(24) : warning C4018: “&lt;”: 有符号/无符号不匹配</font><br />
-rc.exe /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IE:\mycpp\AdobeThumbnail  -foobj\Release\Thumb_ico.res Thumb_ico.rc<br />
-Microsoft (R) Windows (R) Resource Compiler Version 6.1.7600.16385<br />
-Copyright (C) Microsoft Corporation.  All rights reserved.<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\adler32.c /Foobj\Release\ZLib\adler32.obj<br />
-adler32.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\compress.c /Foobj\Release\ZLib\compress.obj<br />
-compress.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\crc32.c /Foobj\Release\ZLib\crc32.obj<br />
-crc32.c<br />
-<font color="#0000ff">otherapi.cpp(19) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\deflate.c /Foobj\Release\ZLib\deflate.obj<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\gzclose.c /Foobj\Release\ZLib\gzclose.obj<br />
-deflate.c<br />
-gzclose.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\gzlib.c /Foobj\Release\ZLib\gzlib.obj<br />
-gzlib.c<br />
-<font color="#0000ff">ZLib\gzlib.c(193) : warning C4996: 'wcstombs': This function or variable may be unsafe. Consider using wcstombs_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdlib.h(533) : 参见“wcstombs”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(208) : warning C4996: 'wcstombs': This function or variable may be unsafe. Consider using wcstombs_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdlib.h(533) : 参见“wcstombs”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(214) : warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(363) : 参见“_snprintf”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(245) : warning C4996: '_wopen': This function or variable may be unsafe. Consider using _wsopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(272) : 参见“_wopen”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(245) : warning C4996: 'open': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _open. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(312) : 参见“open”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(294) : warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(363) : 参见“_snprintf”的声明<br />
-<font color="#0000ff">ZLib\gzlib.c(608) : warning C4996: '_snprintf': This function or variable may be unsafe. Consider using _snprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\gzread.c /Foobj\Release\ZLib\gzread.obj<br />
-        D:\CodeBlocks\MSVC\include\stdio.h(363) : 参见“_snprintf”的声明<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\gzwrite.c /Foobj\Release\ZLib\gzwrite.obj<br />
-gzread.c<br />
-<font color="#0000ff">ZLib\gzread.c(30) : warning C4996: 'read': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _read. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(313) : 参见“read”的声明<br />
-<font color="#0000ff">ZLib\gzread.c(36) : warning C4996: 'strerror': This function or variable may be unsafe. Consider using strerror_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\string.h(157) : 参见“strerror”的声明<br />
-<font color="#0000ff">ZLib\gzread.c(591) : warning C4996: 'close': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _close. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(302) : 参见“close”的声明<br />
-gzwrite.c<br />
-<font color="#0000ff">ZLib\gzwrite.c(84) : warning C4996: 'write': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _write. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(318) : 参见“write”的声明<br />
-<font color="#0000ff">ZLib\gzwrite.c(86) : warning C4996: 'strerror': This function or variable may be unsafe. Consider using strerror_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\string.h(157) : 参见“strerror”的声明<br />
-<font color="#0000ff">ZLib\gzwrite.c(102) : warning C4996: 'write': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _write. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(318) : 参见“write”的声明<br />
-<font color="#0000ff">ZLib\gzwrite.c(103) : warning C4996: 'strerror': This function or variable may be unsafe. Consider using strerror_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\string.h(157) : 参见“strerror”的声明<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\infback.c /Foobj\Release\ZLib\infback.obj<br />
-<font color="#0000ff">ZLib\gzwrite.c(357) : warning C4996: 'vsnprintf': This function or variable may be unsafe. Consider using vsnprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(354) : 参见“vsnprintf”的声明<br />
-<font color="#0000ff">ZLib\gzwrite.c(573) : warning C4996: 'close': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _close. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\io.h(302) : 参见“close”的声明<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\inffast.c /Foobj\Release\ZLib\inffast.obj<br />
-infback.c<br />
-inffast.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\inflate.c /Foobj\Release\ZLib\inflate.obj<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\inftrees.c /Foobj\Release\ZLib\inftrees.obj<br />
-inflate.c<br />
-inftrees.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\ioapi.c /Foobj\Release\ZLib\ioapi.obj<br />
-ioapi.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\iowin32.c /Foobj\Release\ZLib\iowin32.obj<br />
-iowin32.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\mztools.c /Foobj\Release\ZLib\mztools.obj<br />
-mztools.c<br />
-<font color="#0000ff">ZLib\mztools.c(38) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-<font color="#0000ff">ZLib\mztools.c(39) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-<font color="#0000ff">ZLib\mztools.c(40) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-<font color="#0000ff">ZLib\mztools.c(257) : warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.</font><br />
-        D:\CodeBlocks\MSVC\include\stdio.h(234) : 参见“fopen”的声明<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\trees.c /Foobj\Release\ZLib\trees.obj<br />
-trees.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\uncompr.c /Foobj\Release\ZLib\uncompr.obj<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\unzip.c /Foobj\Release\ZLib\unzip.obj<br />
-uncompr.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\zip.c /Foobj\Release\ZLib\zip.obj<br />
-unzip.c<br />
-zip.c<br />
-cl.exe /nologo /W3 /Zc:wchar_t- /EHsc  /Os /O1 /Zc:wchar_t- /DNDEBUG    /ID:\CodeBlocks\build\vc\include /ID:\CodeBlocks\MSVC\include /I"C:\Program Files\Microsoft Visual Studio 10.0\VC\include" /I"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" /ID:\CodeBlocks\MSVC\atlmfc\include /I"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\include" /IZLib /IE:\mycpp\AdobeThumbnail /c ZLib\zutil.c /Foobj\Release\ZLib\zutil.obj<br />
-zutil.c<br />
-link.exe /nologo /subsystem:windows /LIBPATH:D:\CodeBlocks\build\vc\lib /LIBPATH:D:\CodeBlocks\MSVC\lib /LIBPATH:"C:\Program Files\Microsoft Visual Studio 10.0\VC\lib" /LIBPATH:"C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib" /LIBPATH:D:\CodeBlocks\MSVC\atlmfc\lib /LIBPATH:"C:\Program Files (x86)\Microsoft SDKs\Windows\v6.0A\lib" /out:bin\GuiAdobeThumbnail.exe gdi32.lib user32.lib kernel32.lib shell32.lib Setupapi.lib AdvAPI32.lib ComDlg32.lib GuiApp\Everything32.lib GuiApp\XCGUI.lib Gdi32.lib user32.lib Kernel32.lib obj\Release\AdobeThumbnail.obj obj\Release\corel_thumbnail.obj obj\Release\coreldraw_riffinfo.obj obj\Release\deAi7Thumb.obj obj\Release\GuiApp\GuiMain.obj obj\Release\GuiApp\GuiThumbnail.obj obj\Release\otherapi.obj obj\Release\ZLib\adler32.obj obj\Release\ZLib\compress.obj obj\Release\ZLib\crc32.obj obj\Release\ZLib\deflate.obj obj\Release\ZLib\gzclose.obj obj\Release\ZLib\gzlib.obj obj\Release\ZLib\gzread.obj obj\Release\ZLib\gzwrite.obj obj\Release\ZLib\infback.obj obj\Release\ZLib\inffast.obj obj\Release\ZLib\inflate.obj obj\Release\ZLib\inftrees.obj obj\Release\ZLib\ioapi.obj obj\Release\ZLib\iowin32.obj obj\Release\ZLib\mztools.obj obj\Release\ZLib\trees.obj obj\Release\ZLib\uncompr.obj obj\Release\ZLib\unzip.obj obj\Release\ZLib\zip.obj obj\Release\ZLib\zutil.obj  obj\Release\Thumb_ico.res<br />
-Output file is bin\GuiAdobeThumbnail.exe with size 423.50 KB<br />
-<font color="#0000ff">Process terminated with status 0 (0 minute(s), 5 second(s))</font><br />
-<font color="#0000ff">0 error(s), 36 warning(s) (0 minute(s), 5 second(s))</font><br />
-</tt>
-</body>
-</html>

+ 20 - 29
corel_thumbnail.cpp

@@ -3,6 +3,7 @@
 */
 */
 
 
 #include "corel_thumbnail.h"
 #include "corel_thumbnail.h"
+#include <cstdio>
 #include <regex>
 #include <regex>
 #include <string>
 #include <string>
 #include <atlimage.h>
 #include <atlimage.h>
@@ -67,21 +68,23 @@ bool zip_extract_onefile(const char* zip_filename, const char* filename , const
     // 解压先使用 zipOpen64 来打开一个 ZIP 文件
     // 解压先使用 zipOpen64 来打开一个 ZIP 文件
     unzFile uf = unzOpen64(zip_filename);
     unzFile uf = unzOpen64(zip_filename);
 
 
-//    // 需要先使用 unzGetGlobalInfo64 来取得该文件的一些信息,来了解这个压缩包里一共包含了多少个文件,等等。
-//    unz_global_info64 gi;
-//
-//    if (unzGetGlobalInfo64(uf, &gi) != UNZ_OK) {
-//        return false;
-//    }
+    // 需要先使用 unzGetGlobalInfo64 来取得该文件的一些信息,来了解这个压缩包里一共包含了多少个文件,等等。
+    unz_global_info64 gi;
+
+    //  if (unzGetGlobalInfo64(uf, &gi) != UNZ_OK) {
+    //     unzClose(uf);
+    //     return false;
+    //  }
 
 
     // 尝试zip文件中找到该文件szFileName。
     // 尝试zip文件中找到该文件szFileName。
-    int err = UNZ_OK;
     if (unzLocateFile(uf, filename, CASESENSITIVITY) != UNZ_OK) {
     if (unzLocateFile(uf, filename, CASESENSITIVITY) != UNZ_OK) {
 //       printf("file %s not found in the zipfile\n", filename);
 //       printf("file %s not found in the zipfile\n", filename);
+        unzClose(uf);
         return false;
         return false;
     }
     }
 
 
     if (!zip_extract_currentfile(uf, save_filename)) {
     if (!zip_extract_currentfile(uf, save_filename)) {
+        unzClose(uf);
         return false;
         return false;
     }
     }
 
 
@@ -135,7 +138,7 @@ bool cdr_extract_bmp(const char* cdr_filename, const char* bmp_filename)
         if (!ret)  ret = zip_extract_onefile(cdr_filename, "previews/thumbnail.png", bmp_filename);
         if (!ret)  ret = zip_extract_onefile(cdr_filename, "previews/thumbnail.png", bmp_filename);
         }
         }
 
 
-    if (version <= 1300)
+    if (version <= 1300 && version > 1)
         ret = cdr_riff_disp2bmp(cdr_filename, bmp_filename);
         ret = cdr_riff_disp2bmp(cdr_filename, bmp_filename);
 
 
     return ret;
     return ret;
@@ -146,45 +149,33 @@ bool CorelThumbnail(const char* cdr_filename, const char* png_filename)
 {
 {
 
 
     string file_ext(cdr_filename);
     string file_ext(cdr_filename);
-    string rs = "(.+)(\\.(?:cdr|CDR|Cdr|CDr|cdR))";  // 正则字符串,exp开始的单词
-    std::regex expression(rs);                   // 字符串传递给构造函数,建立正则表达式
+    string rs = "(.+)(\\.(?:cdr|CDR|Cdr|CDr|cdR))"; 
+    std::regex expression(rs);                 
     bool ret = regex_match(file_ext, expression);
     bool ret = regex_match(file_ext, expression);
     if (!ret) {
     if (!ret) {
-        //      cout << "文件格式不对!\n";
         return ret ;
         return ret ;
     }
     }
 
 
     FILE* pfile = fopen(cdr_filename, "rb");
     FILE* pfile = fopen(cdr_filename, "rb");
     if(NULL == pfile){
     if(NULL == pfile){
-      MessageBoxA(NULL, cdr_filename, "错误File", MB_OK);
+   //   MessageBoxA(NULL, cdr_filename, "错误File", MB_OK);
       return false;
       return false;
     }
     }
 
 
+    char temp_filename[128];
+    const char* tmpBmpFile =  tmpnam(temp_filename);
+    strcat(temp_filename,".bmp");
 
 
-
-    char bmp_filename[MAX_PATH] = {0};
-
-    if (png_filename == NULL) {
-        char tmp_filename[MAX_PATH] = {0};
-        png_filename = tmp_filename;
-        strcpy(tmp_filename , cdr_filename);
-        strcpy(strrchr(tmp_filename, '.') , ".png");
-    }
-
-    strcpy(bmp_filename , png_filename);
-    strcpy(strrchr(bmp_filename, '.') , ".bmp");
-
-//    printf("%s\t\%s\n", bmp_filename , png_filename);
-    ret =  cdr_extract_bmp(cdr_filename , bmp_filename);
+    ret =  cdr_extract_bmp(cdr_filename , tmpBmpFile);
 
 
     if (!ret)
     if (!ret)
         return false ;
         return false ;
 
 
     CImage image;  //  bmp 转换 png ,需要CImage类,头文件  atlimage.h
     CImage image;  //  bmp 转换 png ,需要CImage类,头文件  atlimage.h
-    image.Load(bmp_filename);
+    image.Load(tmpBmpFile);
     image.Save(png_filename);
     image.Save(png_filename);
 
 
-    if (remove(bmp_filename) != 0)
+    if (remove(tmpBmpFile) != 0)
         perror("Error deleting file");
         perror("Error deleting file");
 
 
     return ret;
     return ret;

+ 6 - 6
coreldraw_riffinfo.cpp

@@ -12,8 +12,10 @@ RIFF_CDR_TYPE cdr_riff ;
 int get_cdrfile_version(const char* cdr_filename)
 int get_cdrfile_version(const char* cdr_filename)
 {
 {
     FILE* cdr_pfile = fopen(cdr_filename , "rb");
     FILE* cdr_pfile = fopen(cdr_filename , "rb");
-    if (cdr_pfile == NULL)
+    if (cdr_pfile == NULL){
+        fclose(cdr_pfile);
         return -1;     // 文件不能读 返回 -1
         return -1;     // 文件不能读 返回 -1
+    }
 
 
     fread(&cdr_riff , 1 , sizeof(cdr_riff) , cdr_pfile);
     fread(&cdr_riff , 1 , sizeof(cdr_riff) , cdr_pfile);
 
 
@@ -82,12 +84,10 @@ bool cdr_riff_disp2bmp(const char* cdr_filename, const char* bmp_filename)
         fwrite(bmp_buf, 1, raw_size + 10, bmp_dispfile);
         fwrite(bmp_buf, 1, raw_size + 10, bmp_dispfile);
         fclose(bmp_dispfile);
         fclose(bmp_dispfile);
         delete[] bmp_buf;
         delete[] bmp_buf;
-
-    } else
-        return false;
-
+    }
+    
     fclose(cdr_pfile);
     fclose(cdr_pfile);
-    return true;
+    return (FCC('DISP') == disp_chunk.fcc);
 }
 }
 
 
 
 

+ 3 - 1
deAi7Thumb.cpp

@@ -153,7 +153,9 @@ bool decode_Ai7Thumb_toPng(string& AI7Thumb, size_t width, size_t height, const
     string hexbin = decodeHex((BYTE*)AI7Thumb.c_str() , AI7Thumb.size());
     string hexbin = decodeHex((BYTE*)AI7Thumb.c_str() , AI7Thumb.size());
     string srgb = decodeAi7Thumbnail(hexbin);
     string srgb = decodeAi7Thumbnail(hexbin);
 
 
-    const char* tmpBmpFile = "tmpBmp.bmp";
+    char temp_filename[128];
+    const char* tmpBmpFile =  tmpnam(temp_filename);
+    strcat(temp_filename,".bmp");
     // RGB 数据写bmp文件
     // RGB 数据写bmp文件
     rgb_makeBmp_tofile(srgb, width, height, tmpBmpFile);
     rgb_makeBmp_tofile(srgb, width, height, tmpBmpFile);