Commit 86e837e3 authored by Roberto Arturo Homs Regojo's avatar Roberto Arturo Homs Regojo Committed by Sebastien Petitdemange

included pragma to disable warning 4251 and little changes to avoid warnings

parent 7c6659d8
......@@ -11,3 +11,4 @@ config.inc
install
*target*
*.pyc
*.bck
//###########################################################################
// This file is part of LImA, a Library for Image Acquisition
//
// Copyright (C) : 2009-2011
// European Synchrotron Radiation Facility
// BP 220, Grenoble 38043
// FRANCE
//
// This is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License, or
// (at your option) any later version.
//
// This software is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, see <http://www.gnu.org/licenses/>.
//###########################################################################

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLimaCore", "LimaCore.vcproj", "{A4B703A6-C50F-442F-8952-54FB8EA51FF3}"
ProjectSection(ProjectDependencies) = postProject
{F6556656-D091-43AF-B46F-355F4ABA5DB6} = {F6556656-D091-43AF-B46F-355F4ABA5DB6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprocesslib", "..\..\..\..\third-party\Processlib\build\msvc\9.0\libprocesslib\libprocesslib.vcproj", "{F6556656-D091-43AF-B46F-355F4ABA5DB6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.ActiveCfg = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.Build.0 = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.ActiveCfg = Release|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.Build.0 = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.ActiveCfg = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.Build.0 = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.ActiveCfg = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 10.00
# Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLimaCore", "LimaCore.vcproj", "{A4B703A6-C50F-442F-8952-54FB8EA51FF3}"
ProjectSection(ProjectDependencies) = postProject
{F6556656-D091-43AF-B46F-355F4ABA5DB6} = {F6556656-D091-43AF-B46F-355F4ABA5DB6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprocesslib", "..\..\..\..\third-party\Processlib\build\msvc\9.0\libprocesslib\libprocesslib.vcproj", "{F6556656-D091-43AF-B46F-355F4ABA5DB6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pco", "..\..\..\..\camera\pco\pco.vcproj", "{2B94198E-6D3C-4169-8274-A02FC408FE45}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.ActiveCfg = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Debug|Win32.Build.0 = Debug|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.ActiveCfg = Release|Win32
{A4B703A6-C50F-442F-8952-54FB8EA51FF3}.Release|Win32.Build.0 = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.ActiveCfg = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Debug|Win32.Build.0 = Debug|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.ActiveCfg = Release|Win32
{F6556656-D091-43AF-B46F-355F4ABA5DB6}.Release|Win32.Build.0 = Release|Win32
{2B94198E-6D3C-4169-8274-A02FC408FE45}.Debug|Win32.ActiveCfg = Debug|Win32
{2B94198E-6D3C-4169-8274-A02FC408FE45}.Debug|Win32.Build.0 = Debug|Win32
{2B94198E-6D3C-4169-8274-A02FC408FE45}.Release|Win32.ActiveCfg = Release|Win32
{2B94198E-6D3C-4169-8274-A02FC408FE45}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
This diff is collapsed.
pco @ 627c90ae
Subproject commit 8999c6c8891c46c405bfc241973d76712147813d
Subproject commit 627c90ae2b8882928a8a7f9a852114a69a50c025
......@@ -25,6 +25,9 @@
#ifndef DEBUG_H
#define DEBUG_H
#pragma warning(disable:4251)
#include "LimaCompatibility.h"
#include "StreamUtils.h"
#include "ThreadUtils.h"
......
......@@ -421,16 +421,16 @@ inline std::ostream& operator <<(std::ostream& os, const Flip& flip)
inline Flip operator-(const Flip &f,const Flip &s)
{
Flip returnFlip;
returnFlip.x = f.x ? (f.x - s.x) : f.x;
returnFlip.y = f.y ? (f.y - s.y) : f.y;
returnFlip.x = f.x ? (f.x - s.x) != 0 : f.x;
returnFlip.y = f.y ? (f.y - s.y) != 0 : f.y;
return returnFlip;
}
inline Flip operator+(const Flip &f,const Flip &s)
{
Flip returnFlip;
returnFlip.x = f.x + s.x;
returnFlip.y = f.y + s.y;
returnFlip.x = (f.x + s.x) != 0 ;
returnFlip.y = (f.y + s.y) != 0 ;
return returnFlip;
}
......
......@@ -43,15 +43,15 @@ inline void _bgr_2_yuv(const unsigned char *data,unsigned char *luma,
*luma = ((25 * data[0] + 129 * data[1] + 66 * data[2]) + 128) >> 8;
}
template<class IN>
inline void _bayer_rg_2_yuv(const IN* bayer0,IN* luma,
template<class xClass>
inline void _bayer_rg_2_yuv(const xClass* bayer0,xClass* luma,
int column,int row)
{
int blue = 1;
int start_with_green = 0;
int luma_step = column * sizeof(IN);
int luma_step = column * sizeof(xClass);
int bayer_step = column;
IN *luma0 = (IN*)luma;
xClass *luma0 = (xClass*)luma;
memset( luma0, 0, luma_step);
memset( luma0 + (row - 1)*bayer_step, 0, luma_step);
luma0 += column + 1;
......@@ -61,9 +61,9 @@ inline void _bayer_rg_2_yuv(const IN* bayer0,IN* luma,
for( ; row > 0;--row,bayer0 += bayer_step, luma0 += bayer_step )
{
int t0, t1;
const IN* bayer = bayer0;
IN* dst = luma0;
const IN* bayer_end = bayer + column;
const xClass* bayer = bayer0;
xClass* dst = luma0;
const xClass* bayer_end = bayer + column;
dst[-1] = 0;
......
......@@ -122,6 +122,7 @@ void CtSaving::Parameters::checkValid() const
throw LIMA_CTL_EXC(InvalidValue, "CBF file format does not support "
"multi frame per file");
break;
#pragma message ( "--- WARNING / TODO - no cases???" )
#endif
default:
break;
......
......@@ -108,7 +108,7 @@ bool CtVideo::_InternalImageCBK::newImage(char * data,int width,int height,Video
if(m_video.m_stopping_live) return false;
liveFlag = m_video.m_pars.live;
int image_counter = m_video.m_image_counter + 1;
int image_counter = (int) m_video.m_image_counter + 1;
aLock.unlock();
if(!liveFlag) // Classic acquisition
......@@ -458,7 +458,7 @@ void CtVideo::getLastImage(CtVideo::Image &anImage) const
void CtVideo::getLastImageCounter(long long &anImageCounter) const
{
AutoMutex aLock(m_cond.mutex());
anImageCounter = m_image_counter;
anImageCounter = (int) m_image_counter;
}
void CtVideo::registerImageCallback(ImageCallback &cb)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment