Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compile error #146

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
40cca52
Initial Qt port.
cristianadam Nov 18, 2014
9761719
* matrix: implemented inverse()
jgressmann Nov 19, 2014
e8bda1b
* Fixed signed/unsigned compare warnings.
jgressmann Nov 19, 2014
3ccc4cd
Merge remote-tracking branch 'upstream/N4073-successor'
cristianadam Feb 24, 2016
8949b81
Removed top level autotools support
cristianadam Feb 24, 2016
94bae84
Restructured the repo structure
cristianadam Feb 24, 2016
56b5139
Moved examples, tests, includes in their own directories
cristianadam Feb 24, 2016
041fb6e
More moving around
cristianadam Feb 24, 2016
b5c1a45
Removed win32 prebuilt binaries
cristianadam Feb 24, 2016
aac917f
Bug fixes to surface::mask_immediate.
mikebmcl Feb 25, 2016
76cd02d
P0267R0: A Proposal to Add 2D Graphics Rendering and Display to C++
cristianadam Feb 26, 2016
5d46cef
Added CMake build support for pixman
cristianadam Feb 26, 2016
13965a7
Removed unused zlib and libpng libraries
cristianadam Feb 28, 2016
4330c83
Cleanup
cristianadam Feb 28, 2016
e711601
Removed qt implementation
cristianadam Feb 28, 2016
644d460
Added cmake build support
cristianadam Feb 28, 2016
d508421
Updated LICENSE.md and README.md
cristianadam Feb 28, 2016
40e9414
Update LICENSE.md
cristianadam Feb 28, 2016
6c3c0f5
Fixes to the surface class's rendering and composing operations membe…
mikebmcl Feb 29, 2016
900212f
Eliminated image_surface ctor that takes another surface; it just doe…
mikebmcl Mar 7, 2016
94bc9d4
Removed extraneous ; from path_data_item.cpp.
mikebmcl Mar 7, 2016
c227307
Fixed typo in io2d.h macro name: Variable_templates_condition_support…
mikebmcl Mar 7, 2016
8aba727
Added missing casts to image_surface.cpp. Fixed other files to proper…
mikebmcl Mar 8, 2016
09b249c
Added enum class refresh_rate along with display_surface::refresh_rat…
mikebmcl Mar 19, 2016
3c5ab1e
Reworked fonts and text rendering to eliminate inheritance (fixing th…
mikebmcl Mar 31, 2016
a348eb5
Bug fix in renamed variable in display_surface-xlib.cpp. Had to add n…
mikebmcl Mar 31, 2016
f227510
Added support for using the X11 Xcb interface as an alternative to th…
mikebmcl Apr 18, 2016
e07b37c
Improved efficiency of letterboxing by reducing overdraw.
mikebmcl Apr 18, 2016
ef6a8ba
Fixed the default font matrix in font_resource_factory to reflect the…
mikebmcl Jul 3, 2016
fc7bd1c
Added support for linux xcb compilation
cristianadam Oct 14, 2016
d797563
Update README.md
cristianadam Aug 30, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
233 changes: 0 additions & 233 deletions .gitignore

This file was deleted.

11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 2.8.12)

project(io2d CXX)

add_subdirectory(io2d/src)
set(IO2D_INCLUDE_DIR
${CMAKE_CURRENT_SOURCE_DIR}/io2d/include
${CMAKE_CURRENT_SOURCE_DIR}/io2d/src/3rd-party/cairo/src)
set(IO2D_LIBRARY io2d)

add_subdirectory(examples/hello-world)
23 changes: 0 additions & 23 deletions GNU-Linux_build_instructions.txt

This file was deleted.

50 changes: 8 additions & 42 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ There are several distinct and unique projects in this repository, each with its
own licensing terms and conditions. If you wish to use one of these libraries,
you must comply with its licensing terms. The maintainer of this repository makes
no claims to authorship or ownership of any files in the directories `/cairo`,
`/pixman`, `/libpng16`, or `/zlib-1.2.8`, except as may be documented in the
appropriate location(s) within those directories. Mention of a directory shall
be deemed to include all subdirectories and their subdirectories, etc., within
the mentioned directory. Mention of files in a directory shall be deemed to
include all files located in that directory and in its subdirectories and their
subdirectories, etc.
`/pixman`, except as may be documented in the appropriate location(s) within
those directories. Mention of a directory shall be deemed to include all
subdirectories and their subdirectories, etc., within the mentioned directory.
Mention of files in a directory shall be deemed to include all files located in
that directory and in its subdirectories and their subdirectories, etc.

cairo
--------------
Expand All @@ -24,28 +23,9 @@ The contents of the `/pixman` directory are subject to the licensing terms descr
in the `/pixman/COPYING` file. For more information about the pixman library,
please see [pixman.org](http://www.pixman.org/) or [cgit.freedesktop.org/pixman/](http://cgit.freedesktop.org/pixman/).

libpng
--------------
The contents of the `/libpng16` directory are subject to the licensing terms
described in the `/libpng16/LICENSE` file. For more information about libpng,
please see [libpng.org](http://www.libpng.org/pub/png/libpng.html).

zlib
--------------
The contents of the `/zlib-1.2.8` directory are subject to the licensing terms
described in the `/zlib-1.2.8/zlib.h` file. For more information about zlib,
please see [zlib.net](http://zlib.net/).

win32
--------------

With the exception of the files contained in the directories
`/N3888_RefImpl/src/win32/DLLs`, `/N3888_RefImpl/src/win32/include`, and
`/N3888_RefImpl/src/win32/libs`, the following license applies to the files contained
in the `/N3888_RefImpl` directory.


`The MIT License (MIT)
```
The MIT License (MIT)

Copyright (c) 2014 Michael B. McLaughlin

Expand All @@ -66,21 +46,7 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`


The files in `/N3888_RefImpl/src/win32/include` are header files used to interface
with the cairo graphics library. Their license is described above under the **cairo**
section.

The files in `/N3888_RefImpl/src/win32/libs` are .lib files used to dynamically
link with:

* The cairo graphics library in accordance with the terms of the Mozilla
Public License version 1.1, a copy of which can be found at
`/cairo/COPYING-MPL-1.1`.
* The zlib general purpose compression library in accordance with the terms
of its license, which can be found at `/zlib-1.2.8/zlib.h`.

The files in `/N3888_RefImpl/src/win32/DLLs` are executable code versions of
cairo and zlib in the form of DLL files. These files were built in accordance
with the instructions provided at `/N3888_RefImpl/src/win32/DLL build instructions.txt`.
Their licensing is as described above for the .lib files.
```
2 changes: 0 additions & 2 deletions Makefile.am

This file was deleted.

46 changes: 0 additions & 46 deletions N3888_RefImpl/.gitignore

This file was deleted.

Binary file removed N3888_RefImpl/Debug_Clang_C2/cairo.dll
Binary file not shown.
Binary file removed N3888_RefImpl/Debug_Clang_C2/zlib1.dll
Binary file not shown.
2 changes: 0 additions & 2 deletions N3888_RefImpl/Makefile.am

This file was deleted.

Loading