jfmcarreira/calyp
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge lot of cool stuff in master

Browse Source 
Make it stable and release it
This commit is contained in:
jfmcarreira committed 2015-01-17 03:52:19 +00:00
1 parent 3e6b04e983
commit 58a0b11c8f
69 files changed
+1854 -2487
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lib/PlaYUVerFrameStats.cpp
+9 -6
View File
@@ -1,6 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ PlaYUVerFrameStats::PlaYUVerFrameStats() :
PlaYUVerFrameStats::~PlaYUVerFrameStats()
{
if( m_pdHistogram )
delete[] m_pdHistogram;
freeMem1D( m_pdHistogram );
}
@@ -72,7 +72,10 @@ Void PlaYUVerFrameStats::xSetupStatistics( const PlaYUVerFrame *pcFrame, UInt op
Void PlaYUVerFrameStats::calcHistogram()
{
m_bHasHistogram = false;
m_bRunningFlag = true;
//m_bHasHistogram = false;
if( m_bHasHistogram )
return;
getMem1D<Double>( &( m_pdHistogram ), m_uiHistoSegments * histoChannels );
if( !m_pdHistogram )
@@ -97,7 +100,7 @@ Void PlaYUVerFrameStats::calcHistogram()
m_pdHistogram[*( data[LUMA] ) + LUMA * m_uiHistoSegments]++;
data[LUMA] += 1;
}
for( i = 0; ( i < imageChromaSize ) && runningFlag; i++ )
for( i = 0; ( i < imageChromaSize ) && m_bRunningFlag; i++ )
{
for( j = 1; j < m_uiChannels; j++ )
{
@@ -115,7 +118,7 @@ Void PlaYUVerFrameStats::calcHistogram()
data[COLOR_G] = m_pppImageData[COLOR_G][0];
data[COLOR_B] = m_pppImageData[COLOR_B][0];
for( i = 0; ( i < m_uiImageHeight * m_uiImageWidth ) && runningFlag; i++ )
for( i = 0; ( i < m_uiImageHeight * m_uiImageWidth ) && m_bRunningFlag; i++ )
{
for( j = 0; j < m_uiChannels; j++ )
{