Skip to content

Commit

Permalink
Version 11.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
papyrussolution committed Feb 23, 2021
1 parent 69b3f81 commit d1211f9
Show file tree
Hide file tree
Showing 177 changed files with 48,234 additions and 39,840 deletions.
Binary file modified Src/Build/versel.dll
Binary file not shown.
9 changes: 8 additions & 1 deletion Src/BuildVC2017/GnuPlot-541gh.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,9 @@
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-pstricks.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-svg.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-texdraw.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-tkcanvas.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-win.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\write_png_image.c" />
<ClCompile Include="..\Osf\GnuPlot-541gh\time.c" />
<ClCompile Include="..\Osf\GnuPlot-541gh\unset.c" />
<ClCompile Include="..\Osf\GnuPlot-541gh\util.c" />
Expand Down Expand Up @@ -378,7 +380,6 @@
<None Include="..\OSF\GnuPlot-541gh\term\t410x.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\tek.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\tgif.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\tkcanvas.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\vgagl.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\vws.trm" />
<None Include="..\OSF\GnuPlot-541gh\term\webp.trm" />
Expand All @@ -400,6 +401,9 @@
<ProjectReference Include="cairo-1.16.0.vcxproj">
<Project>{530693b1-8b95-4993-8bcf-c0d0e225f4df}</Project>
</ProjectReference>
<ProjectReference Include="libpng.vcxproj">
<Project>{04aa636d-9d3e-4e79-9c2e-b8d0470719da}</Project>
</ProjectReference>
<ProjectReference Include="lualib.vcxproj">
<Project>{86b30cd8-8c99-4cff-804e-16eb5891a1d8}</Project>
</ProjectReference>
Expand All @@ -412,6 +416,9 @@
<ProjectReference Include="slib.vcxproj">
<Project>{d507e468-21fc-4209-a5a8-de1f055866dc}</Project>
</ProjectReference>
<ProjectReference Include="zlib.vcxproj">
<Project>{c23c2b5b-224b-475d-8ae3-82289a87602c}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
7 changes: 4 additions & 3 deletions Src/BuildVC2017/GnuPlot-541gh.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-cairo.c">
<Filter>Term</Filter>
</ClCompile>
<ClCompile Include="..\OSF\GnuPlot-541gh\term\write_png_image.c" />
<ClCompile Include="..\OSF\GnuPlot-541gh\term\terminal-tkcanvas.c">
<Filter>Term</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\OSF\GnuPlot-541gh\gnuplot.h">
Expand Down Expand Up @@ -301,9 +305,6 @@
<None Include="..\OSF\GnuPlot-541gh\term\tgif.trm">
<Filter>Term</Filter>
</None>
<None Include="..\OSF\GnuPlot-541gh\term\tkcanvas.trm">
<Filter>Term</Filter>
</None>
<None Include="..\OSF\GnuPlot-541gh\term\vgagl.trm">
<Filter>Term</Filter>
</None>
Expand Down
4 changes: 4 additions & 0 deletions Src/BuildVC2017/cairo-1.16.0.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -942,6 +942,7 @@
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Universe-HTT|Win32'">$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Universe-HTT|x64'">$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
</ClCompile>
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-pdf-interchange.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-pdf-operators.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-pdf-shading.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-pdf-surface.c" />
Expand Down Expand Up @@ -980,6 +981,8 @@
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-surface-wrapper.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-surface.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-svg-surface.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-tag-attributes.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-tag-stack.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-tee-surface.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-time.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-tor-scan-converter.c" />
Expand All @@ -995,6 +998,7 @@
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-type3-glyph-surface.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-unicode.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-user-font.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-version.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-vg-surface.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-wgl-context.c" />
<ClCompile Include="..\Osf\Cairo-1160\Src\cairo-wideint.c" />
Expand Down
4 changes: 4 additions & 0 deletions Src/BuildVC2017/cairo-1.16.0.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@
<ClCompile Include="..\Osf\Cairo-1160\Pixman\pixman-trap.c" />
<ClCompile Include="..\Osf\Cairo-1160\Pixman\pixman-utils.c" />
<ClCompile Include="..\Osf\Cairo-1160\Pixman\pixman-x86.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-pdf-interchange.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-tag-stack.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-tag-attributes.c" />
<ClCompile Include="..\OSF\CAIRO-1160\SRC\cairo-version.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\Include\Cairo-1160\cairo-beos.h">
Expand Down
22 changes: 21 additions & 1 deletion Src/Doc/VERSION.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -16345,4 +16345,24 @@ Ver 1.2 Date 13/09/96
- {������������� ������} ������������ ����������� � ������� ��������������� ����������� ������� ���������.
- {�����} �������������� �������� �� ���� �������� ��� ��������� ������������.
-FIX: {������� ����� � ���������������� ����} ��������� ������ � �������������� ���������������� ����.

23/02/2021 v11.0.2
��������! ������� ��������� ��������� � ������� ������������ ���� ������/������� � ���� �������/��������.
� ����� � ���� ������� ����������� ��������� � ������ ���� ������� �� ������ ����� ����������������
������� ������� � ����� (11.0.2).

- {������� ����������} ��� �������� � �������� nalog.ru ����������� ���������� � ��������� �� ���� ��������
!- {��� ������ �������� ��������} �������� ������������ ������������� ������ (���� ��������� ������� ��� ��� ����������).
!- {�����-���������} ��������� ������� �������� �����-������� �� ������� �����-������� ��� �����-�������
�� ������� �����-�������.
!- {����� �������/��������} ��������� �������� ����������� �������� � ����� ��������� ���� ������
� ���� �� ���������.
- {��������������} � ����������� ��������� ������� ���������� ���� GTIN14/SERIAL �� ���������
����� '������� ����'.
����� ����, � ����������� ��������� ������� ������� ����������� � ������������ ���������� (log10 � log ��������������).
!- {������} ����������� ������������ ������� �������� ����� � ������� iCalendar. ������� ������� ���� �� ���������.
- {��������������} ��������� ���������� ��������������� �������� ��������� ����� �� ������ �����.
��� ��� ��������� �� ���� �������������� ����������, �� �������� �� ��� ����� ������ ���
�������� �� ������ ��������.
-FIX: {����������� �������� ����} ��� ������� ����������� �������� ������ ������ �� �����������
�������������� �������� ����� ����� (�������� ������ � �.�.).

20 changes: 6 additions & 14 deletions Src/Include/CAIRO-1160/cairo-beos.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,14 @@
#include "cairo.h"

#if CAIRO_HAS_BEOS_SURFACE
#include <View.h>

#include <View.h>

CAIRO_BEGIN_DECLS

cairo_public cairo_surface_t *
cairo_beos_surface_create (BView* view);

cairo_public cairo_surface_t *
cairo_beos_surface_create_for_bitmap (BView* view,
BBitmap* bmp);

CAIRO_END_DECLS

CAIRO_BEGIN_DECLS
cairo_public cairo_surface_t * cairo_beos_surface_create(BView* view);
cairo_public cairo_surface_t * cairo_beos_surface_create_for_bitmap(BView* view, BBitmap* bmp);
CAIRO_END_DECLS
#else /* CAIRO_HAS_BEOS_SURFACE */
#error Cairo was not compiled with support for the beos backend
#error Cairo was not compiled with support for the beos backend
#endif /* CAIRO_HAS_BEOS_SURFACE */

#endif /* CAIRO_BEOS_H */
40 changes: 15 additions & 25 deletions Src/Include/CAIRO-1160/cairo-cogl.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,38 +32,28 @@
* Contributor(s):
* Robert Bragg <robert@linux.intel.com>
*/

#ifndef CAIRO_VG_H
#define CAIRO_VG_H

#include "cairo.h"

#if CAIRO_HAS_COGL_SURFACE

#include <cogl/cogl2-experimental.h>

CAIRO_BEGIN_DECLS

cairo_public cairo_device_t *
cairo_cogl_device_create (CoglContext *context);

cairo_public cairo_surface_t *
cairo_cogl_surface_create (cairo_device_t *device,
CoglFramebuffer *framebuffer);

cairo_public CoglFramebuffer *
cairo_cogl_surface_get_framebuffer (cairo_surface_t *surface);

cairo_public CoglTexture *
cairo_cogl_surface_get_texture (cairo_surface_t *surface);

cairo_public void
cairo_cogl_surface_end_frame (cairo_surface_t *surface);

CAIRO_END_DECLS

#include <cogl/cogl2-experimental.h>

CAIRO_BEGIN_DECLS
cairo_public cairo_device_t *
cairo_cogl_device_create (CoglContext *context);
cairo_public cairo_surface_t *
cairo_cogl_surface_create (cairo_device_t *device, CoglFramebuffer *framebuffer);
cairo_public CoglFramebuffer *
cairo_cogl_surface_get_framebuffer (cairo_surface_t *surface);
cairo_public CoglTexture *
cairo_cogl_surface_get_texture (cairo_surface_t *surface);
cairo_public void
cairo_cogl_surface_end_frame (cairo_surface_t *surface);
CAIRO_END_DECLS
#else /* CAIRO_HAS_COGL_SURFACE*/
#error Cairo was not compiled with support for the Cogl backend
#error Cairo was not compiled with support for the Cogl backend
#endif /* CAIRO_HAS_COGL_SURFACE*/

#endif /* CAIRO_COGL_H */
60 changes: 12 additions & 48 deletions Src/Include/CAIRO-1160/cairo-os2.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,63 +46,27 @@
#define INCL_GPI

#include "cairo.h"

#include <os2.h>

CAIRO_BEGIN_DECLS

/* The OS/2 Specific Cairo API */

cairo_public void
cairo_os2_init (void);

cairo_public void
cairo_os2_fini (void);
cairo_public void cairo_os2_init(void);
cairo_public void cairo_os2_fini(void);

#if CAIRO_HAS_OS2_SURFACE

cairo_public cairo_surface_t *
cairo_os2_surface_create (HPS hps_client_window,
int width,
int height);

cairo_public cairo_surface_t *
cairo_os2_surface_create_for_window (HWND hwnd_client_window,
int width,
int height);

cairo_public void
cairo_os2_surface_set_hwnd (cairo_surface_t *surface,
HWND hwnd_client_window);

cairo_public int
cairo_os2_surface_set_size (cairo_surface_t *surface,
int new_width,
int new_height,
int timeout);

cairo_public void
cairo_os2_surface_refresh_window (cairo_surface_t *surface,
HPS hps_begin_paint,
PRECTL prcl_begin_paint_rect);

cairo_public void
cairo_os2_surface_set_manual_window_refresh (cairo_surface_t *surface,
boolint manual_refresh);

cairo_public boolint
cairo_os2_surface_get_manual_window_refresh (cairo_surface_t *surface);

cairo_public cairo_status_t
cairo_os2_surface_get_hps (cairo_surface_t *surface,
HPS *hps);

cairo_public cairo_status_t
cairo_os2_surface_set_hps (cairo_surface_t *surface,
HPS hps);

cairo_public cairo_surface_t * cairo_os2_surface_create(HPS hps_client_window, int width, int height);
cairo_public cairo_surface_t * cairo_os2_surface_create_for_window(HWND hwnd_client_window, int width, int height);
cairo_public void cairo_os2_surface_set_hwnd(cairo_surface_t * surface, HWND hwnd_client_window);
cairo_public int cairo_os2_surface_set_size(cairo_surface_t * surface, int new_width, int new_height, int timeout);
cairo_public void cairo_os2_surface_refresh_window(cairo_surface_t * surface, HPS hps_begin_paint, PRECTL prcl_begin_paint_rect);
cairo_public void cairo_os2_surface_set_manual_window_refresh(cairo_surface_t * surface, boolint manual_refresh);
cairo_public boolint cairo_os2_surface_get_manual_window_refresh(cairo_surface_t * surface);
cairo_public cairo_status_t cairo_os2_surface_get_hps(cairo_surface_t * surface, HPS * hps);
cairo_public cairo_status_t cairo_os2_surface_set_hps(cairo_surface_t * surface, HPS hps);
#else /* CAIRO_HAS_OS2_SURFACE */
#error Cairo was not compiled with support for the OS/2 backend
#error Cairo was not compiled with support for the OS/2 backend
#endif /* CAIRO_HAS_OS2_SURFACE */

CAIRO_END_DECLS
Expand Down
Loading

0 comments on commit d1211f9

Please sign in to comment.