enable FexTracker on unix, and fix a bulkload of warnings in it
Originally committed to SVN as r916.
This commit is contained in:
David Lamparter
parent
9434459821
commit
66b91c41c3
14 changed files with 53 additions and 13 deletions
|
|
@ -89,4 +89,5 @@ void BaseFloatImage_LanczosRescale( float* in, int inSx, int inSy, float* out, i
|
|||
|
||||
#undef FilterWidth
|
||||
#undef FilterWeight
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,4 +46,5 @@
|
|||
#undef PixelMin
|
||||
#undef PixelMax
|
||||
#undef ImagePlanes
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,4 +38,5 @@
|
|||
cc->Weight[n-cc->xMin] += weight;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,4 +53,5 @@
|
|||
for( int x=0;x<ImageOutSX;++x )
|
||||
delete []Contrib[x].Weight;
|
||||
delete []Contrib;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,4 +38,5 @@ public:
|
|||
struct FexFilterContribution {
|
||||
int xMin, xMax;
|
||||
double* Weight;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ void BaseFloatImage_LanczosRescale( float* in, int inSx, int inSy, float* out, i
|
|||
|
||||
//turn off image debugging
|
||||
#ifndef imdebug
|
||||
#define imdebug //
|
||||
#define imdebug(a,b,c,d) //
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,13 @@
|
|||
|
||||
#include "StdAfx.h"
|
||||
#include "stdio.h"
|
||||
#ifdef WIN32
|
||||
#include <conio.h>
|
||||
#endif
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <wchar.h>
|
||||
//#include <mmsystem.h>
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -32,11 +35,26 @@ FEXTRACKER_API FexMovement* CreateMovement()
|
|||
return new FexMovement();
|
||||
}
|
||||
|
||||
#ifndef WIN32
|
||||
FILE *_wfopen(const wchar_t *wname, const wchar_t *wmode)
|
||||
{
|
||||
size_t namelen = wcstombs(NULL, wname, 0) + 1;
|
||||
char name[namelen];
|
||||
wcstombs(name, wname, namelen);
|
||||
|
||||
size_t modelen = wcstombs(NULL, wmode, 0) + 1;
|
||||
char mode[modelen];
|
||||
wcstombs(mode, wmode, modelen);
|
||||
|
||||
return fopen(name, mode);
|
||||
}
|
||||
#endif
|
||||
|
||||
FEXTRACKER_API void LoadMovement( FexMovement* me, const wchar_t* Filename )
|
||||
{
|
||||
me->Frames.nVal = 0;
|
||||
|
||||
me->FileName = new WCHAR[ wcslen(Filename)+1 ];
|
||||
me->FileName = new wchar_t[ wcslen(Filename)+1 ];
|
||||
wcscpy( me->FileName, Filename );
|
||||
|
||||
FILE *fi = _wfopen( Filename, L"rt" );
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class FexMovement
|
|||
public:
|
||||
FexMovement();
|
||||
~FexMovement();
|
||||
WCHAR* FileName;
|
||||
wchar_t* FileName;
|
||||
|
||||
tenlist<FexMovementFrame> Frames;
|
||||
};
|
||||
|
|
|
|||
12
FexTrackerSource/Makefile.am
Normal file
12
FexTrackerSource/Makefile.am
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
SUFFIXES = .c .cpp
|
||||
noinst_LIBRARIES = libfex.a
|
||||
AM_CPPFLAGS = -DAEGISUB
|
||||
|
||||
libfex_a_SOURCES = \
|
||||
FexGenericFilter.cpp \
|
||||
FexGenericFilter_BaseFloatImage.cpp \
|
||||
FexImgPyramid.cpp \
|
||||
FexMovement.cpp \
|
||||
FexTracker.cpp \
|
||||
FexTrackerMovement.cpp \
|
||||
FexTrackingFeature.cpp
|
||||
|
|
@ -17,7 +17,9 @@
|
|||
// Insert your headers here
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <memory.h>
|
||||
|
|
@ -31,7 +33,7 @@
|
|||
#ifdef IMAGE_DEBUGGER
|
||||
#include "ext/imdebug.h"
|
||||
#else
|
||||
#define imdebug //
|
||||
#define imdebug(a,b,c,d) //
|
||||
#endif
|
||||
|
||||
// TODO: reference additional headers your program requires here
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = ac aegisub locale
|
||||
SUBDIRS = ac FexTrackerSource aegisub locale
|
||||
|
||||
lua51/src/liblua.a:
|
||||
make -C lua51/src CC=$(CXX) a
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ DARCSREV := $(strip $(shell head -n 1 ../_darcs/inventory 2>/dev/null))
|
|||
REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBUILD_DARCS)
|
||||
BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION)
|
||||
|
||||
AM_CPPFLAGS = -Iposix -include posix/defines.h $(BUILDINFO)
|
||||
LDADD = posix/libposix.a ../lua51/src/liblua.a -lGL -lGLU
|
||||
AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO)
|
||||
LDADD = posix/libposix.a ../lua51/src/liblua.a ../FexTrackerSource/libfex.a -lGL -lGLU
|
||||
|
||||
# auto4_ruby_assfile.cpp
|
||||
# auto4_ruby.cpp
|
||||
|
|
@ -55,6 +55,7 @@ aegisub_SOURCES = \
|
|||
dialog_colorpicker.cpp \
|
||||
dialog_detached_video.cpp \
|
||||
dialog_export.cpp \
|
||||
dialog_fextracker.cpp \
|
||||
dialog_fonts_collector.cpp \
|
||||
dialog_hotkeys.cpp \
|
||||
dialog_jumpto.cpp \
|
||||
|
|
@ -123,6 +124,7 @@ aegisub_SOURCES = \
|
|||
video_box.cpp \
|
||||
video_context.cpp \
|
||||
video_display.cpp \
|
||||
video_display_fextracker.cpp \
|
||||
video_display_visual.cpp \
|
||||
video_frame.cpp \
|
||||
video_provider.cpp \
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ typedef uint64_t __uint64;
|
|||
#define USE_LAVC 0
|
||||
#endif
|
||||
#define USE_PRS 0
|
||||
#define USE_FEXTRACKER 0
|
||||
#define USE_FEXTRACKER 1
|
||||
#ifndef USE_LIBSSA
|
||||
#define USE_LIBSSA 0
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -188,6 +188,7 @@ AC_OUTPUT([
|
|||
Makefile
|
||||
ac/Makefile
|
||||
locale/Makefile
|
||||
FexTrackerSource/Makefile
|
||||
aegisub/Makefile
|
||||
aegisub/posix/Makefile
|
||||
aegisub/bitmaps/Makefile
|
||||
|
|
|
|||
Loading…
Reference in a new issue