Attachment 199717 Details for Bug 233491 – osgearth with files

[patch] osgearth with files

osgearth.diff (text/plain), 2.01 KB, created by Loïc Bartoletti on 2018-12-01 17:37:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2018-12-01 17:37:27 UTC

Size: 2.01 KB

patch

obsolete

>Index: patch-src_osgEarthDrivers_fastdxt_libdxt.cpp
>===================================================================
>--- patch-src_osgEarthDrivers_fastdxt_libdxt.cpp	(nonexistent)
>+++ patch-src_osgEarthDrivers_fastdxt_libdxt.cpp	(copie de travail)
>@@ -0,0 +1,18 @@
>+--- src/osgEarthDrivers/fastdxt/libdxt.cpp.orig	2018-11-18 08:01:55 UTC
>++++ src/osgEarthDrivers/fastdxt/libdxt.cpp
>+@@ -24,7 +24,7 @@
>+ 
>+ #include "libdxt.h"
>+ 
>+-#if defined(__APPLE__)
>++#if defined(__APPLE__) || (__FreeBSD__)
>+ #define memalign(x,y) malloc((y))
>+ #else
>+ #include <malloc.h>
>+@@ -92,4 +92,4 @@ int CompressDXT(const byte *in, byte *out, int width, 
>+   // Join all the threads
>+   nbbytes = job.nbb;
>+   return nbbytes;
>+-}
>+\ No newline at end of file
>++}
>
>Property changes on: patch-src_osgEarthDrivers_fastdxt_libdxt.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: patch-src_osgEarthDrivers_fastdxt_util.h
>===================================================================
>--- patch-src_osgEarthDrivers_fastdxt_util.h	(nonexistent)
>+++ patch-src_osgEarthDrivers_fastdxt_util.h	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- src/osgEarthDrivers/fastdxt/util.h.orig	2018-11-18 08:00:00 UTC
>++++ src/osgEarthDrivers/fastdxt/util.h
>+@@ -64,7 +64,7 @@ void aFree(void* const p);
>+ float drand48(void);
>+ #endif
>+ 
>+-#if defined(__APPLE__)
>++#if defined(__APPLE__) || defined(__FreeBSD__)
>+ #define memalign(x,y) malloc((y))
>+ #else
>+ #include <malloc.h>
>
>Property changes on: patch-src_osgEarthDrivers_fastdxt_util.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 233491: 199533 | 199716 | 199717