Skip to content

Instantly share code, notes, and snippets.

View sled's full-sized avatar

Simon Schmid sled

  • Zurich, Switzerland
View GitHub Profile
diff -r edccf8cc52e3 RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Fri Jun 20 00:53:20 2014 +0200
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Thu Oct 02 00:33:03 2014 +0200
@@ -118,7 +118,7 @@
NSString *windowTitle = [NSString stringWithCString:name.c_str() encoding:NSUTF8StringEncoding];
int winx = 0, winy = 0;
int depth = 32;
- NameValuePairList::const_iterator opt(NULL);
+ NameValuePairList::const_iterator opt;
diff --git a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm
--- a/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Sat Sep 27 20:56:56 2014 +0200
+++ b/RenderSystems/GL/src/OSX/OgreOSXCocoaWindow.mm Thu Oct 02 22:35:36 2014 +0200
@@ -282,6 +282,8 @@
}
mWindow = [mView window];
+ [mWindow retain];
+
mIsExternal = true;
diff --git a/python/setup.py b/python/setup.py
index ac367d0..322e99b 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -22,7 +22,7 @@ from setuptools import setup, find_packages
from setuptools.command import test
REQUIRE = [
- "python-dateutil>=1.4,<2",
+ "python-dateutil>=1.4",
diff -r edccf8cc52e3 CMake/Packages/FindFreetype.cmake
--- a/CMake/Packages/FindFreetype.cmake Fri Jun 20 00:53:20 2014 +0200
+++ b/CMake/Packages/FindFreetype.cmake Fri Oct 03 00:01:16 2014 +0200
@@ -43,7 +43,7 @@
findpkg_framework(FREETYPE)
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
diff -r edccf8cc52e3 -r 5abe2b02ec8a CMake/Packages/FindFreetype.cmake
--- a/CMake/Packages/FindFreetype.cmake Fri Jun 20 00:53:20 2014 +0200
+++ b/CMake/Packages/FindFreetype.cmake Fri Oct 03 00:11:51 2014 +0200
@@ -43,7 +43,7 @@
findpkg_framework(FREETYPE)
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
diff -r edccf8cc52e3 CMake/Packages/FindFreetype.cmake
--- a/CMake/Packages/FindFreetype.cmake Fri Jun 20 00:53:20 2014 +0200
+++ b/CMake/Packages/FindFreetype.cmake Fri Oct 03 01:19:56 2014 +0200
@@ -43,7 +43,7 @@
findpkg_framework(FREETYPE)
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
apr:
osx:
homebrew:
packages: []
assimp:
osx:
homebrew:
packages: [assimp]
assimp-dev:
osx:
@sled
sled / check.rb
Created October 5, 2015 13:25
Checks whether a mail is probably a google apps email
#!/usr/bin/env ruby
require 'resolv'
require 'public_suffix'
email = ARGV[0]
domain = email.split("@").last
servers = %w(googlemail.com, google.com)
@sled
sled / 0_reuse_code.js
Created November 16, 2015 10:27
Here are some things you can do with Gists in GistBox.
// Use Gists to store code you would like to remember later on
console.log(window); // log the "window" object to the console
@sled
sled / secure_compare.rb
Created November 17, 2015 08:25
Constant time comparisons
# constant-time comparison algorithm to prevent timing attacks
def self.secure_compare(a, b)
return false if a.blank? || b.blank? || a.bytesize != b.bytesize
l = a.unpack "C#{a.bytesize}"
res = 0
b.each_byte { |byte| res |= byte ^ l.shift }
res == 0
end
end