57 lines
1.4 KiB
Diff
57 lines
1.4 KiB
Diff
|
From 3a6ae55eda9ec41b03634f7da419a0fb11664277 Mon Sep 17 00:00:00 2001
|
||
|
|
Date: Wed, 25 May 2016 15:15:04 +0300
|
||
|
|
Subject: поддержка celestia
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
---
|
||
|
|
src/celengine/image.cpp | 4 +++-
|
||
|
|
src/celengine/texture.cpp | 1 +
|
||
|
|
src/celestia/imagecapture.cpp | 2 +-
|
||
|
|
3 files changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/celengine/image.cpp b/src/celengine/image.cpp
|
||
|
|
index a36b9c1..f72800d 100644
|
||
|
|
--- a/src/celengine/image.cpp
|
||
|
|
+++ b/src/celengine/image.cpp
|
||
|
|
@@ -41,7 +41,9 @@ extern "C" {
|
||
|
|
#ifdef _WIN32
|
||
|
|
#include "jpeglib.h"
|
||
|
|
#else
|
||
|
|
-#include <cstdio>
|
||
|
|
+//#include <cstdio>
|
||
|
|
+#include <stdio.h>
|
||
|
|
+#include <string.h>
|
||
|
|
#include <jpeglib.h>
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
diff --git a/src/celengine/texture.cpp b/src/celengine/texture.cpp
|
||
|
|
index 0775204..c8dc622 100644
|
||
|
|
--- a/src/celengine/texture.cpp
|
||
|
|
+++ b/src/celengine/texture.cpp
|
||
|
|
@@ -57,6 +57,7 @@
|
||
|
|
#endif // PNG_SUPPORT
|
||
|
|
|
||
|
|
extern "C" {
|
||
|
|
+#include <string.h>
|
||
|
|
#ifdef _WIN32
|
||
|
|
#include "jpeglib.h"
|
||
|
|
#else
|
||
|
|
diff --git a/src/celestia/imagecapture.cpp b/src/celestia/imagecapture.cpp
|
||
|
|
index 92602da..234179e 100644
|
||
|
|
--- a/src/celestia/imagecapture.cpp
|
||
|
|
+++ b/src/celestia/imagecapture.cpp
|
||
|
|
@@ -12,7 +12,7 @@
|
||
|
|
#include "../celengine/gl.h"
|
||
|
|
#include <celengine/celestia.h>
|
||
|
|
#include "imagecapture.h"
|
||
|
|
-
|
||
|
|
+#include <zlib.h>
|
||
|
|
extern "C" {
|
||
|
|
#ifdef _WIN32
|
||
|
|
#include "jpeglib.h"
|
||
|
|
--
|
||
|
|
2.16.4
|
||
|
|
|