Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ImgCalibration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Calculation
ImgCalibration
Commits
3896cf2b
Commit
3896cf2b
authored
Feb 21, 2007
by
Julien Malik
Browse files
Options
Downloads
Patches
Plain Diff
correct a memory leak
parent
fee607c1
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
msvc/ds_ImgCalibration.dsp
+131
-0
131 additions, 0 deletions
msvc/ds_ImgCalibration.dsp
msvc/ds_ImgCalibration.dsw
+59
-0
59 additions, 0 deletions
msvc/ds_ImgCalibration.dsw
src/ImgCalibrationTask.cpp
+5
-1
5 additions, 1 deletion
src/ImgCalibrationTask.cpp
with
195 additions
and
1 deletion
msvc/ds_ImgCalibration.dsp
0 → 100644
+
131
−
0
View file @
3896cf2b
# Microsoft Developer Studio Project File - Name="ds_ImgCalibration" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=ds_ImgCalibration - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "ds_ImgCalibration.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ds_ImgCalibration.mak" CFG="ds_ImgCalibration - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "ds_ImgCalibration - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "ds_ImgCalibration - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "ds_ImgCalibration - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GR /GX /Z7 /Ox /Gy /X /I "C:\PROGRA~1\Microsoft Visual Studio\VC98\INCLUDE" /I "D:\dev\Libraries\ADTB\include" /I "$(SOLEIL_ROOT)\sw-support\OpenCV\include" /I "D:\dev\Libraries\ISL\include" /I "..\src" /I "..\include" /I "$(SOLEIL_ROOT)\omniorb\include" /I "$(SOLEIL_ROOT)\tango\include" /I "$(SOLEIL_ROOT)\dev\include" /D "WIN32" /D "NDEBUG" /D "INTEL86" /D "STRICT" /D "WIN32_LEAN_AND_MEAN" /D "VC_EXTRALEAN" /FR /FD /Zm1000 /c
# ADD BASE RSC /l 0x40c /d "NDEBUG"
# ADD RSC /l 0x40c /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 $(SOLEIL_ROOT)\tango\lib\mix\log4tango.lib $(SOLEIL_ROOT)\tango\lib\mix\tango.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniORB405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omnithread30_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\COS405_rt.lib $(SOLEIL_ROOT)\omniorb\lib\x86_win32\omniDynamic405_rt.lib kernel32.lib user32.lib gdi32.lib advapi32.lib ws2_32.lib comctl32.lib /nologo /subsystem:console /debug /machine:I386
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ds_ImgCalibration - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "D:\dev\Libraries\ADTB\include" /I "$(SOLEIL_ROOT)\sw-support\OpenCV\include" /I "D:\dev\Libraries\ISL\include" /I "C:\PROGRA~1\Microsoft Visual Studio\VC98\INCLUDE" /I "..\src" /I "..\include" /I "$(SOLEIL_ROOT)\omniorb\include" /I "$(SOLEIL_ROOT)\tango\include" /I "$(SOLEIL_ROOT)\dev\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x40c /d "_DEBUG"
# ADD RSC /l 0x40c /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "ds_ImgCalibration - Win32 Release"
# Name "ds_ImgCalibration - Win32 Debug"
# Begin Group "src"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\src\ClassFactory.cpp
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibration.cpp
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibration.h
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationClass.cpp
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationClass.h
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationStateMachine.cpp
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationTask.cpp
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationTask.h
# End Source File
# Begin Source File
SOURCE=..\src\ImgCalibrationTask.i
# End Source File
# Begin Source File
SOURCE=..\src\main.cpp
# End Source File
# End Group
# End Target
# End Project
This diff is collapsed.
Click to expand it.
msvc/ds_ImgCalibration.dsw
0 → 100644
+
59
−
0
View file @
3896cf2b
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "ATDB Static library"=..\..\..\Libraries\ADTB\msvc\6.0\adtb_static_lib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "ISL"=..\..\..\Libraries\ISL\msvc\ISL.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "ds_ImgCalibration"=.\ds_ImgCalibration.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name ISL
End Project Dependency
Begin Project Dependency
Project_Dep_Name ATDB Static library
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
This diff is collapsed.
Click to expand it.
src/ImgCalibrationTask.cpp
+
5
−
1
View file @
3896cf2b
...
...
@@ -808,6 +808,7 @@ void ImgCalibrationTask::undistort_i(isl::Image & source_image)
source_image
.
serialize
(
data
->
source_image
.
base
()
);
corrected_image
->
serialize
(
data
->
corrected_image
.
base
()
);
SAFE_DELETE_PTR
(
corrected_image
);
}
catch
(
isl
::
Exception
&
ex
)
{
...
...
@@ -937,6 +938,9 @@ void ImgCalibrationTask::calibrate_i(isl::Image & pattern_image)
data
->
x_mag_factor
=
this
->
calib_
.
x_mag_factor
();
data
->
y_mag_factor
=
this
->
calib_
.
y_mag_factor
();
SAFE_DELETE_PTR
(
corrected_pattern
);
SAFE_DELETE_PTR
(
delaunay_subdiv
);
SAFE_DELETE_PTR
(
error_map
);
}
catch
(
isl
::
Exception
&
ex
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment