This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apr: | |
osx: | |
homebrew: | |
packages: [] | |
assimp: | |
osx: | |
homebrew: | |
packages: [assimp] | |
assimp-dev: | |
osx: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/usr/bin/env ruby | |
require 'resolv' | |
require 'public_suffix' | |
email = ARGV[0] | |
domain = email.split("@").last | |
servers = %w(googlemail.com, google.com) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// Use Gists to store code you would like to remember later on | |
console.log(window); // log the "window" object to the console |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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 |
OlderNewer