Permalink
Browse files

Revert "fixed some missing things"

This reverts commit be589a7.
  • Loading branch information...
1 parent be589a7 commit 037b746d5ac1ee58d4ad749a5d719c8dd9efef9c @kylemcdonald kylemcdonald committed Jan 28, 2012
View
8 CloningWrapper/src/Clone.cpp
@@ -106,10 +106,6 @@ void Clone::update(ofTexture& src, ofTexture& dst, ofTexture& mask) {
buffer.end();
}
-void Clone::draw(float x, float y, float width, float height) {
- buffer.draw(x, y, width, height);
-}
-
-ofTexture& Clone::getTextureRef() {
- return buffer.getTextureReference();
+void Clone::draw(float x, float y) {
+ buffer.draw(x, y);
}
View
3 CloningWrapper/src/Clone.h
@@ -7,8 +7,7 @@ class Clone {
void setup(int width, int height);
void setStrength(int strength);
void update(ofTexture& src, ofTexture& dst, ofTexture& mask);
- void draw(float x, float y, float width, float height);
- ofTexture& getTextureRef();
+ void draw(float x, float y);
protected:
void maskedBlur(ofTexture& tex, ofTexture& mask, ofFbo& result);
View
6 FaceSubstitution/FaceSubstitution.xcodeproj/project.pbxproj
@@ -17,7 +17,6 @@
2705B4C0143D6F0400F2A09E /* Tracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2705B4B8143D6F0400F2A09E /* Tracker.cpp */; };
2705B4C1143D6F0400F2A09E /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2705B4B9143D6F0400F2A09E /* Utilities.cpp */; };
2705B4C2143D6F0400F2A09E /* Wrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2705B4BA143D6F0400F2A09E /* Wrappers.cpp */; };
- 272DFDFF14D3A1F7006C28B0 /* FaceLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 272DFDFD14D3A1F7006C28B0 /* FaceLoader.cpp */; };
2751AADF143D78A100605D00 /* CLM.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2751AAC8143D78A100605D00 /* CLM.cc */; };
2751AAE0143D78A100605D00 /* FCheck.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2751AACA143D78A100605D00 /* FCheck.cc */; };
2751AAE1143D78A100605D00 /* FDet.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2751AACC143D78A100605D00 /* FDet.cc */; };
@@ -167,8 +166,6 @@
2705B4B8143D6F0400F2A09E /* Tracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tracker.cpp; path = ../../../addons/ofxCv/libs/ofxCv/src/Tracker.cpp; sourceTree = SOURCE_ROOT; };
2705B4B9143D6F0400F2A09E /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utilities.cpp; path = ../../../addons/ofxCv/libs/ofxCv/src/Utilities.cpp; sourceTree = SOURCE_ROOT; };
2705B4BA143D6F0400F2A09E /* Wrappers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Wrappers.cpp; path = ../../../addons/ofxCv/libs/ofxCv/src/Wrappers.cpp; sourceTree = SOURCE_ROOT; };
- 272DFDFD14D3A1F7006C28B0 /* FaceLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FaceLoader.cpp; path = src/FaceLoader.cpp; sourceTree = SOURCE_ROOT; };
- 272DFDFE14D3A1F7006C28B0 /* FaceLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FaceLoader.h; path = src/FaceLoader.h; sourceTree = SOURCE_ROOT; };
2751AAC7143D78A100605D00 /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .gitignore; path = ../../../addons/ofxFaceTracker/libs/Tracker/.gitignore; sourceTree = SOURCE_ROOT; };
2751AAC8143D78A100605D00 /* CLM.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CLM.cc; path = ../../../addons/ofxFaceTracker/libs/Tracker/CLM.cc; sourceTree = SOURCE_ROOT; };
2751AAC9143D78A100605D00 /* CLM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLM.h; path = ../../../addons/ofxFaceTracker/libs/Tracker/CLM.h; sourceTree = SOURCE_ROOT; };
@@ -675,8 +672,6 @@
E4B69E1C0A3A1BDC003C02F2 /* src */ = {
isa = PBXGroup;
children = (
- 272DFDFD14D3A1F7006C28B0 /* FaceLoader.cpp */,
- 272DFDFE14D3A1F7006C28B0 /* FaceLoader.h */,
275D3600149D10A800132EA7 /* BlinkDetector.cpp */,
275D3601149D10A800132EA7 /* BlinkDetector.h */,
270204F7144B448100E65507 /* Clone.cpp */,
@@ -808,7 +803,6 @@
270204F9144B448100E65507 /* Clone.cpp in Sources */,
275D3602149D10A800132EA7 /* BlinkDetector.cpp in Sources */,
275D361C149D334B00132EA7 /* ofxFaceTrackerThreaded.cpp in Sources */,
- 272DFDFF14D3A1F7006C28B0 /* FaceLoader.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2 FaceSubstitution/src/FaceLoader.cpp
@@ -8,9 +8,7 @@
#include "FaceLoader.h"
#include "ofxFaceTracker.h"
#include "Poco/ScopedLock.h"
-#include "ofxCv.h"
-using namespace ofxCv;
int randomDifferent(int low, int high, int old) {
int cur = ofRandom(low, high - 1);

0 comments on commit 037b746

Please sign in to comment.