diff options
| -rw-r--r-- | html/en/drv/pdf.html | 5 | ||||
| -rw-r--r-- | html/en/history.html | 1 | ||||
| -rw-r--r-- | mak.vc9/cd.sln | 19 | ||||
| -rw-r--r-- | mak.vc9/cd.vcproj | 531 | ||||
| -rw-r--r-- | mak.vc9/cdgdiplus.vcproj | 18 | ||||
| -rw-r--r-- | mak.vc9/cdgdk.vcproj | 494 | ||||
| -rw-r--r-- | mak.vc9/cdx11.vcproj | 50 | ||||
| -rw-r--r-- | src/cd.def | 1 | ||||
| -rw-r--r-- | src/drv/cdpdf.c | 14 | ||||
| -rw-r--r-- | src/gdk/cdgdk.c | 4 | ||||
| -rw-r--r-- | src/gdk/cdgdk.h | 6 | ||||
| -rw-r--r-- | test/simple/iupmain.c | 8 |
12 files changed, 108 insertions, 1043 deletions
diff --git a/html/en/drv/pdf.html b/html/en/drv/pdf.html index fd5ae23..9198a38 100644 --- a/html/en/drv/pdf.html +++ b/html/en/drv/pdf.html @@ -223,6 +223,11 @@ the vertex where there is a hole in a </ul> <ul> + <li>"<b><font face="Courier">PDFLIBVERSION</font></b>": Returns the full + PDFlib version string in the format <major>.<minor>.<revision>.</li> +</ul> + +<ul> <li><b><font face="Courier">"SUBJECT","TITLE","CREATOR","AUTHOR","KEYWORDS"</font></b>: write only attributes that allows to set a description string for the respective document information field.</li> diff --git a/html/en/history.html b/html/en/history.html index 322bcdb..7a993cd 100644 --- a/html/en/history.html +++ b/html/en/history.html @@ -29,6 +29,7 @@ <strong>wdCanvasTranslate</strong> and <strong>wdCanvasScale</strong>, to better control the WD transformation.</li> <li><span style="color: #0000FF">New:</span> + "PDFLIBVERSION", "SUBJECT","TITLE","CREATOR","AUTHOR","KEYWORDS" attributes for the PDF driver.</li> <li><span class="style1">Changed</span><span class="hist_changed">:</span> diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln index 3b8c3a6..d3a7047 100644 --- a/mak.vc9/cd.sln +++ b/mak.vc9/cd.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cd", "cd.vcproj", "{01818D2C-65AF-4D5C-9452-4DFF401C6461}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdwin", "cd.vcproj", "{01818D2C-65AF-4D5C-9452-4DFF401C6461}" ProjectSection(ProjectDependencies) = postProject {01818D2C-65AF-AFDC-4356-1234401C6461} = {01818D2C-65AF-AFDC-4356-1234401C6461} EndProjectSection @@ -22,10 +22,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdlua5", "cdlua5.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdpdf", "cdpdf.vcproj", "{8441F69D-7135-43B2-974F-45C6123C8467}" ProjectSection(ProjectDependencies) = postProject + {01818D2C-1234-4D5C-ABCD-4DFF401C6461} = {01818D2C-1234-4D5C-ABCD-4DFF401C6461} {8441F69D-7135-ABCD-1234-45C6123C8467} = {8441F69D-7135-ABCD-1234-45C6123C8467} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdx11", "cdx11.vcproj", "{01818D2C-7689-4D5C-1234-4DFF401C6461}" + ProjectSection(ProjectDependencies) = postProject + {01818D2C-1234-4D5C-ABCD-4DFF401C6461} = {01818D2C-1234-4D5C-ABCD-4DFF401C6461} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf3", "cdluapdf3.vcproj", "{B4823266-DF8C-AAAA-9999-C7E78C234EAC}" ProjectSection(ProjectDependencies) = postProject @@ -40,6 +44,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluapdf5", "cdluapdf5.vcpr EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdxrender", "cdxrender.vcproj", "{160DEDA5-C1AA-48C7-8B07-490C6A8DE2EE}" + ProjectSection(ProjectDependencies) = postProject + {01818D2C-7689-4D5C-1234-4DFF401C6461} = {01818D2C-7689-4D5C-1234-4DFF401C6461} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluaim5", "cdluaim5.vcproj", "{CB863607-6B6C-0000-0000-123400001234}" ProjectSection(ProjectDependencies) = postProject @@ -51,6 +58,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype6", "cd_freetype.vcproj", "{01818D2C-65AF-AFDC-4356-1234401C6461}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdluacontextplus5", "cdluacontextplus5.vcproj", "{B4823266-DF8C-ABCD-1234-C7688C234EAC}" + ProjectSection(ProjectDependencies) = postProject + {53FC9752-81C1-4AA6-B366-A7890A2B81F6} = {53FC9752-81C1-4AA6-B366-A7890A2B81F6} + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lua5", "Lua5", "{EFB1BE3C-2981-456B-8E32-928CBDFF7822}" EndProject @@ -73,6 +83,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimple", "cdsimple.vcproj EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdgdk", "cdgdk.vcproj", "{01818D2C-AAAA-4D5C-ABCD-1234401C6461}" + ProjectSection(ProjectDependencies) = postProject + {01818D2C-1234-4D5C-ABCD-4DFF401C6461} = {01818D2C-1234-4D5C-ABCD-4DFF401C6461} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimplegdk", "cdsimplegdk.vcproj", "{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}" ProjectSection(ProjectDependencies) = postProject @@ -80,6 +93,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimplegdk", "cdsimplegdk. {8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdcore", "cdcore.vcproj", "{01818D2C-1234-4D5C-ABCD-4DFF401C6461}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -117,6 +132,8 @@ Global {01818D2C-AAAA-4D5C-ABCD-1234401C6461}.Debug|Win32.Build.0 = Debug|Win32 {82BC36B1-DDDD-41D4-ABCD-A12312378CE6}.Debug|Win32.ActiveCfg = Debug|Win32 {82BC36B1-DDDD-41D4-ABCD-A12312378CE6}.Debug|Win32.Build.0 = Debug|Win32 + {01818D2C-1234-4D5C-ABCD-4DFF401C6461}.Debug|Win32.ActiveCfg = Debug|Win32 + {01818D2C-1234-4D5C-ABCD-4DFF401C6461}.Debug|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mak.vc9/cd.vcproj b/mak.vc9/cd.vcproj index 27ab993..b0a5786 100644 --- a/mak.vc9/cd.vcproj +++ b/mak.vc9/cd.vcproj @@ -2,8 +2,9 @@ <VisualStudioProject ProjectType="Visual C++" Version="9,00" - Name="cd" + Name="cdwin" ProjectGUID="{01818D2C-65AF-4D5C-9452-4DFF401C6461}" + RootNamespace="cdwin" TargetFrameworkVersion="0" > <Platforms> @@ -66,7 +67,9 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="cdcore.lib" OutputFile="$(OutDir)/$(ProjectName).lib" + AdditionalLibraryDirectories="$(OutDir)" SuppressStartupBanner="true" /> <Tool @@ -90,556 +93,52 @@ </References> <Files> <Filter - Name="INTCGM" + Name="inc" > <File - RelativePath="..\src\intcgm\bparse.c" - > - </File> - <File - RelativePath="..\src\intcgm\circle.c" - > - </File> - <File - RelativePath="..\src\intcgm\ellipse.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm1.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm2.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm4.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm6.c" - > - </File> - <File - RelativePath="..\src\intcgm\list.c" - > - </File> - <File - RelativePath="..\src\intcgm\sism.c" - > - </File> - <File - RelativePath="..\src\intcgm\tparse.c" - > - </File> - <Filter - Name="INC" - > - <File - RelativePath="..\src\intcgm\bparse.h" - > - </File> - <File - RelativePath="..\src\intcgm\circle.h" - > - </File> - <File - RelativePath="..\src\intcgm\ellipse.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm2.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm4.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm6.h" - > - </File> - <File - RelativePath="..\src\intcgm\list.h" - > - </File> - <File - RelativePath="..\src\intcgm\sism.h" - > - </File> - <File - RelativePath="..\src\intcgm\tparse.h" - > - </File> - <File - RelativePath="..\src\intcgm\types.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="WIN32" - > - <File - RelativePath="..\src\win32\cdwclp.c" - > - </File> - <File - RelativePath="..\src\win32\cdwdbuf.c" - > - </File> - <File - RelativePath="..\src\win32\cdwdib.c" - > - </File> - <File - RelativePath="..\src\win32\cdwemf.c" - > - </File> - <File - RelativePath="..\src\win32\cdwimg.c" - > - </File> - <File - RelativePath="..\src\win32\cdwin.c" - > - </File> - <File RelativePath="..\src\win32\cdwin.h" > </File> - <File - RelativePath="..\src\win32\cdwnative.c" - > - </File> - <File - RelativePath="..\src\win32\cdwprn.c" - > - </File> - <File - RelativePath="..\src\win32\cdwwmf.c" - > - </File> - <File - RelativePath="..\src\win32\wmf_emf.c" - > - </File> - </Filter> - <Filter - Name="SIM" - > - <File - RelativePath="..\src\sim\cd_truetype.c" - > - </File> - <File - RelativePath="..\src\sim\cdfontex.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\sim\sim.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\sim\sim.h" - > - </File> - <File - RelativePath="..\src\sim\sim_linepolyfill.c" - > - </File> - <File - RelativePath="..\src\sim\sim_other.c" - > - </File> - <File - RelativePath="..\src\sim\sim_primitives.c" - > - </File> - <File - RelativePath="..\src\sim\sim_text.c" - > - </File> - <File - RelativePath="..\src\sim\truetype.h" - > - </File> </Filter> - <Filter - Name="DRV" - > - <File - RelativePath="..\src\drv\cdcgm.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cddebug.c" - > - </File> - <File - RelativePath="..\src\drv\cddgn.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cddxf.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdirgb.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdmf.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdpicture.c" - > - </File> - <File - RelativePath="..\src\drv\cdps.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\svg\cdsvg.c" - > - </File> - <File - RelativePath="..\src\drv\cgm.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cgm.h" - > - </File> - <Filter - Name="SVG" - > - <File - RelativePath="..\src\svg\base64.c" - > - </File> - <File - RelativePath="..\src\svg\base64.h" - > - </File> - <File - RelativePath="..\src\svg\lodepng.c" - > - </File> - <File - RelativePath="..\src\svg\lodepng.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\cd.h" - > - </File> - <File - RelativePath="..\include\cd_old.h" - > - </File> - <File - RelativePath="..\include\cd_private.h" - > - </File> - <File - RelativePath="..\include\cdcgm.h" - > - </File> - <File - RelativePath="..\include\cdclipbd.h" - > - </File> - <File - RelativePath="..\include\cddbuf.h" - > - </File> - <File - RelativePath="..\include\cddebug.h" - > - </File> - <File - RelativePath="..\include\cddgn.h" - > - </File> - <File - RelativePath="..\include\cddxf.h" - > - </File> - <File - RelativePath="..\include\cdemf.h" - > - </File> - <File - RelativePath="..\include\cdimage.h" - > - </File> - <File - RelativePath="..\include\cdirgb.h" - > - </File> - <File - RelativePath="..\include\cdmf.h" - > - </File> - <File - RelativePath="..\include\cdmf_private.h" - > - </File> - <File - RelativePath="..\include\cdnative.h" - > - </File> - <File - RelativePath="..\include\cdprint.h" - > - </File> - <File - RelativePath="..\include\cdps.h" - > - </File> - <File - RelativePath="..\include\cdwmf.h" - > - </File> - <File - RelativePath="..\include\wd.h" - > - </File> - <File - RelativePath="..\include\wd_old.h" - > - </File> - </Filter> - <File - RelativePath="..\src\cd.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\cd.def" - > - </File> - <File - RelativePath="..\src\cd_active.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> <File - RelativePath="..\src\cd_attributes.c" + RelativePath="..\src\win32\cdwclp.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_bitmap.c" + RelativePath="..\src\win32\cdwdbuf.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_image.c" + RelativePath="..\src\win32\cdwdib.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_primitives.c" + RelativePath="..\src\win32\cdwemf.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_text.c" + RelativePath="..\src\win32\cdwimg.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_util.c" + RelativePath="..\src\win32\cdwin.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_vectortext.c" + RelativePath="..\src\win32\cdwnative.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\rgb2map.c" + RelativePath="..\src\win32\cdwprn.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\wd.c" + RelativePath="..\src\win32\cdwwmf.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\wdhdcpy.c" + RelativePath="..\src\win32\wmf_emf.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> </Files> <Globals> diff --git a/mak.vc9/cdgdiplus.vcproj b/mak.vc9/cdgdiplus.vcproj index 87ad217..ea2c437 100644 --- a/mak.vc9/cdgdiplus.vcproj +++ b/mak.vc9/cdgdiplus.vcproj @@ -89,10 +89,18 @@ <References> </References> <Files> - <File - RelativePath="..\include\cdgdiplus.h" + <Filter + Name="inc" > - </File> + <File + RelativePath="..\include\cdgdiplus.h" + > + </File> + <File + RelativePath="..\src\gdiplus\cdwinp.h" + > + </File> + </Filter> <File RelativePath="..\src\gdiplus\cdwclpp.cpp" > @@ -118,10 +126,6 @@ > </File> <File - RelativePath="..\src\gdiplus\cdwinp.h" - > - </File> - <File RelativePath="..\src\gdiplus\cdwnativep.cpp" > </File> diff --git a/mak.vc9/cdgdk.vcproj b/mak.vc9/cdgdk.vcproj index ccd0e78..9911bad 100644 --- a/mak.vc9/cdgdk.vcproj +++ b/mak.vc9/cdgdk.vcproj @@ -66,7 +66,9 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="cdcore.lib" OutputFile="$(OutDir)/$(ProjectName).lib" + AdditionalLibraryDirectories="$(OutDir)" SuppressStartupBanner="true" /> <Tool @@ -90,512 +92,32 @@ </References> <Files> <Filter - Name="INTCGM" + Name="inc" > <File - RelativePath="..\src\intcgm\bparse.c" - > - </File> - <File - RelativePath="..\src\intcgm\circle.c" - > - </File> - <File - RelativePath="..\src\intcgm\ellipse.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm1.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm2.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm4.c" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm6.c" - > - </File> - <File - RelativePath="..\src\intcgm\list.c" - > - </File> - <File - RelativePath="..\src\intcgm\sism.c" - > - </File> - <File - RelativePath="..\src\intcgm\tparse.c" - > - </File> - <Filter - Name="INC" - > - <File - RelativePath="..\src\intcgm\bparse.h" - > - </File> - <File - RelativePath="..\src\intcgm\circle.h" - > - </File> - <File - RelativePath="..\src\intcgm\ellipse.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm2.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm4.h" - > - </File> - <File - RelativePath="..\src\intcgm\intcgm6.h" - > - </File> - <File - RelativePath="..\src\intcgm\list.h" - > - </File> - <File - RelativePath="..\src\intcgm\sism.h" - > - </File> - <File - RelativePath="..\src\intcgm\tparse.h" - > - </File> - <File - RelativePath="..\src\intcgm\types.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="GDK" - > - <File - RelativePath="..\src\gdk\cdgdk.c" - > - </File> - <File RelativePath="..\src\gdk\cdgdk.h" > </File> - <File - RelativePath="..\src\gdk\cdgdkclp.c" - > - </File> - <File - RelativePath="..\src\gdk\cdgdkdbuf.c" - > - </File> - <File - RelativePath="..\src\gdk\cdgdkimg.c" - > - </File> - <File - RelativePath="..\src\gdk\cdgdknative.c" - > - </File> - </Filter> - <Filter - Name="SIM" - > - <File - RelativePath="..\src\sim\cd_truetype.c" - > - </File> - <File - RelativePath="..\src\sim\cdfontex.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\sim\sim.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\sim\sim.h" - > - </File> - <File - RelativePath="..\src\sim\sim_linepolyfill.c" - > - </File> - <File - RelativePath="..\src\sim\sim_other.c" - > - </File> - <File - RelativePath="..\src\sim\sim_primitives.c" - > - </File> - <File - RelativePath="..\src\sim\sim_text.c" - > - </File> - <File - RelativePath="..\src\sim\truetype.h" - > - </File> </Filter> - <Filter - Name="DRV" - > - <File - RelativePath="..\src\drv\cdcgm.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cddebug.c" - > - </File> - <File - RelativePath="..\src\drv\cddgn.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cddxf.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdirgb.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdmf.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cdpicture.c" - > - </File> - <File - RelativePath="..\src\drv\cdps.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cgm.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\drv\cgm.h" - > - </File> - </Filter> - <Filter - Name="include" - > - <File - RelativePath="..\include\cd.h" - > - </File> - <File - RelativePath="..\include\cd_old.h" - > - </File> - <File - RelativePath="..\include\cd_private.h" - > - </File> - <File - RelativePath="..\include\cdcgm.h" - > - </File> - <File - RelativePath="..\include\cdclipbd.h" - > - </File> - <File - RelativePath="..\include\cddbuf.h" - > - </File> - <File - RelativePath="..\include\cddebug.h" - > - </File> - <File - RelativePath="..\include\cddgn.h" - > - </File> - <File - RelativePath="..\include\cddxf.h" - > - </File> - <File - RelativePath="..\include\cdemf.h" - > - </File> - <File - RelativePath="..\include\cdimage.h" - > - </File> - <File - RelativePath="..\include\cdirgb.h" - > - </File> - <File - RelativePath="..\include\cdmf.h" - > - </File> - <File - RelativePath="..\include\cdmf_private.h" - > - </File> - <File - RelativePath="..\include\cdnative.h" - > - </File> - <File - RelativePath="..\include\cdprint.h" - > - </File> - <File - RelativePath="..\include\cdps.h" - > - </File> - <File - RelativePath="..\include\cdwmf.h" - > - </File> - <File - RelativePath="..\include\wd.h" - > - </File> - <File - RelativePath="..\include\wd_old.h" - > - </File> - </Filter> - <File - RelativePath="..\src\cd.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\cd.def" - > - </File> - <File - RelativePath="..\src\cd_active.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\cd_attributes.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\cd_bitmap.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\cd_image.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> <File - RelativePath="..\src\cd_primitives.c" + RelativePath="..\src\gdk\cdgdk.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_text.c" + RelativePath="..\src\gdk\cdgdkclp.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_util.c" + RelativePath="..\src\gdk\cdgdkdbuf.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\cd_vectortext.c" + RelativePath="..\src\gdk\cdgdkimg.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> <File - RelativePath="..\src\rgb2map.c" + RelativePath="..\src\gdk\cdgdknative.c" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\wd.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> - </File> - <File - RelativePath="..\src\wdhdcpy.c" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - WarningLevel="4" - /> - </FileConfiguration> </File> </Files> <Globals> diff --git a/mak.vc9/cdx11.vcproj b/mak.vc9/cdx11.vcproj index 5a9d16f..8336785 100644 --- a/mak.vc9/cdx11.vcproj +++ b/mak.vc9/cdx11.vcproj @@ -66,7 +66,9 @@ /> <Tool Name="VCLibrarianTool" + AdditionalDependencies="cdcore.lib" OutputFile="$(OutDir)/$(ProjectName).lib" + AdditionalLibraryDirectories="$(OutDir)" SuppressStartupBanner="true" /> <Tool @@ -89,22 +91,37 @@ <References> </References> <Files> + <Filter + Name="inc" + > + <File + RelativePath="..\src\x11\cdx11.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\src\x11\xvertex.h" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + </File> + </Filter> <File RelativePath="..\src\x11\cdx11.c" > </File> <File - RelativePath="..\src\x11\cdx11.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> - <File RelativePath="..\src\x11\cdxclp.c" > </File> @@ -124,17 +141,6 @@ RelativePath="..\src\x11\xvertex.c" > </File> - <File - RelativePath="..\src\x11\xvertex.h" - > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - /> - </FileConfiguration> - </File> </Files> <Globals> </Globals> @@ -147,6 +147,7 @@ EXPORTS wdWorld2Canvas wdCanvas2World wdCanvasSetTransform + wdCanvasGetTransform wdCanvasTranslate wdCanvasScale diff --git a/src/drv/cdpdf.c b/src/drv/cdpdf.c index 8faa824..a5d91d4 100644 --- a/src/drv/cdpdf.c +++ b/src/drv/cdpdf.c @@ -1396,6 +1396,19 @@ static cdAttribute pdf_attrib = get_pdf_attrib }; +static char* get_version_attrib(cdCtxCanvas* ctxcanvas) +{ + (void)ctxcanvas; + return (char*)PDF_get_parameter(ctxcanvas->pdf, "version", 0); +} + +static cdAttribute version_attrib = +{ + "PDFLIBVERSION", + NULL, + get_version_attrib +}; + static void cdcreatecanvas(cdCanvas* canvas, void *data) { char *line = (char *)data; @@ -1437,6 +1450,7 @@ static void cdcreatecanvas(cdCanvas* canvas, void *data) cdRegisterAttribute(canvas, &creator_attrib); cdRegisterAttribute(canvas, &author_attrib); cdRegisterAttribute(canvas, &keywords_attrib); + cdRegisterAttribute(canvas, &version_attrib); setpdfdefaultvalues(ctxcanvas); diff --git a/src/gdk/cdgdk.c b/src/gdk/cdgdk.c index e0692fc..5a84c6e 100644 --- a/src/gdk/cdgdk.c +++ b/src/gdk/cdgdk.c @@ -15,8 +15,8 @@ #include <gdk/gdk.h> -GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb); /* access to the color table */ -void (*cdgdkGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, +static GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb); /* access to the color table */ +static void (*cdgdkGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, unsigned char* red, unsigned char* green, unsigned char* blue); /* access to the color table */ diff --git a/src/gdk/cdgdk.h b/src/gdk/cdgdk.h index 82cb25d..86ac7a6 100644 --- a/src/gdk/cdgdk.h +++ b/src/gdk/cdgdk.h @@ -69,12 +69,6 @@ struct _cdCtxCanvas { #define cdCOLOR8TO16(_x) (_x*257) /* 65535/255 = 257 */ #define cdCOLOR16TO8(_x) ((unsigned char)(_x/257)) -extern GdkColor (*cdgdkGetPixel)(cdCtxCanvas *ctxcanvas, unsigned long rgb); -extern void (*cdxGetRGB)(cdCtxCanvas *ctxcanvas, unsigned long pixel, - unsigned char* red, - unsigned char* green, - unsigned char* blue); - cdCtxCanvas *cdgdkCreateCanvas(cdCanvas* canvas, GdkDrawable* wnd, GdkScreen* scr, GdkVisual* vis); void cdgdkInitTable(cdCanvas* canvas); void cdgdkKillCanvas(cdCtxCanvas *ctxcanvas); diff --git a/test/simple/iupmain.c b/test/simple/iupmain.c index e8af887..2f2efc1 100644 --- a/test/simple/iupmain.c +++ b/test/simple/iupmain.c @@ -21,12 +21,14 @@ int main(int argc, char** argv) simple_loadled(); +#ifdef USE_GDK + IupSetAttribute(IupGetHandle("SimpleCanvas"), "CD_GDK", "YES"); +#endif + IupSetAttribute(IupGetHandle("SimpleDialog"), "PLACEMENT", "MAXIMIZED"); IupShow(IupGetHandle("SimpleDialog")); -#ifdef USE_GDK - IupSetAttribute(IupGetHandle("SimpleCanvas"), "CD_GDK", "Yes"); -#endif + SimpleCreateCanvas((char*)IupGetHandle("SimpleCanvas")); IupSetFunction("cmdExit", (Icallback) cmdExit); |