Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
d052232e
Commit
d052232e
authored
Dec 16, 2013
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
atmo: fix some dealocation mismatch
parent
8da9db5e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
14 deletions
+14
-14
modules/video_filter/atmo/AtmoOutputFilter.cpp
modules/video_filter/atmo/AtmoOutputFilter.cpp
+14
-14
No files found.
modules/video_filter/atmo/AtmoOutputFilter.cpp
View file @
d052232e
...
@@ -31,16 +31,16 @@ CAtmoOutputFilter::CAtmoOutputFilter(CAtmoConfig *atmoConfig )
...
@@ -31,16 +31,16 @@ CAtmoOutputFilter::CAtmoOutputFilter(CAtmoConfig *atmoConfig )
CAtmoOutputFilter
::~
CAtmoOutputFilter
(
void
)
CAtmoOutputFilter
::~
CAtmoOutputFilter
(
void
)
{
{
if
(
m_percent_filter_output_old
)
if
(
m_percent_filter_output_old
)
delete
(
char
*
)
m_percent_filter_output_old
;
delete
[]
m_percent_filter_output_old
;
if
(
m_mean_filter_output_old
)
if
(
m_mean_filter_output_old
)
delete
(
char
*
)
m_mean_filter_output_old
;
delete
[]
m_mean_filter_output_old
;
if
(
m_mean_values
)
if
(
m_mean_values
)
delete
(
char
*
)
m_mean_values
;
delete
[]
m_mean_values
;
if
(
m_mean_sums
)
if
(
m_mean_sums
)
delete
(
char
*
)
m_mean_sums
;
delete
[]
m_mean_sums
;
}
}
void
CAtmoOutputFilter
::
ResetFilter
(
void
)
void
CAtmoOutputFilter
::
ResetFilter
(
void
)
...
@@ -76,13 +76,13 @@ pColorPacket CAtmoOutputFilter::PercentFilter(pColorPacket filter_input, ATMO_BO
...
@@ -76,13 +76,13 @@ pColorPacket CAtmoOutputFilter::PercentFilter(pColorPacket filter_input, ATMO_BO
if
(
init
)
// Initialization
if
(
init
)
// Initialization
{
{
if
(
m_percent_filter_output_old
)
if
(
m_percent_filter_output_old
)
delete
(
char
*
)
m_percent_filter_output_old
;
delete
[]
m_percent_filter_output_old
;
m_percent_filter_output_old
=
NULL
;
m_percent_filter_output_old
=
NULL
;
return
(
NULL
);
return
(
NULL
);
}
}
if
(
!
m_percent_filter_output_old
||
(
m_percent_filter_output_old
->
numColors
!=
filter_input
->
numColors
))
{
if
(
!
m_percent_filter_output_old
||
(
m_percent_filter_output_old
->
numColors
!=
filter_input
->
numColors
))
{
delete
m_percent_filter_output_old
;
delete
[]
m_percent_filter_output_old
;
AllocColorPacket
(
m_percent_filter_output_old
,
filter_input
->
numColors
);
AllocColorPacket
(
m_percent_filter_output_old
,
filter_input
->
numColors
);
ZeroColorPacket
(
m_percent_filter_output_old
);
ZeroColorPacket
(
m_percent_filter_output_old
);
}
}
...
@@ -106,7 +106,7 @@ pColorPacket CAtmoOutputFilter::PercentFilter(pColorPacket filter_input, ATMO_BO
...
@@ -106,7 +106,7 @@ pColorPacket CAtmoOutputFilter::PercentFilter(pColorPacket filter_input, ATMO_BO
CopyColorPacket
(
filter_output
,
m_percent_filter_output_old
);
CopyColorPacket
(
filter_output
,
m_percent_filter_output_old
);
delete
(
char
*
)
filter_input
;
delete
[]
filter_input
;
return
filter_output
;
return
filter_output
;
}
}
...
@@ -124,33 +124,33 @@ pColorPacket CAtmoOutputFilter::MeanFilter(pColorPacket filter_input, ATMO_BOOL
...
@@ -124,33 +124,33 @@ pColorPacket CAtmoOutputFilter::MeanFilter(pColorPacket filter_input, ATMO_BOOL
if
(
init
)
// Initialization
if
(
init
)
// Initialization
{
{
if
(
m_mean_filter_output_old
)
if
(
m_mean_filter_output_old
)
delete
(
char
*
)
m_mean_filter_output_old
;
delete
[]
m_mean_filter_output_old
;
m_mean_filter_output_old
=
NULL
;
m_mean_filter_output_old
=
NULL
;
if
(
m_mean_values
)
if
(
m_mean_values
)
delete
(
char
*
)
m_mean_values
;
delete
[]
m_mean_values
;
m_mean_values
=
NULL
;
m_mean_values
=
NULL
;
if
(
m_mean_sums
)
if
(
m_mean_sums
)
delete
(
char
*
)
m_mean_sums
;
delete
[]
m_mean_sums
;
m_mean_sums
=
NULL
;
m_mean_sums
=
NULL
;
return
(
NULL
);
return
(
NULL
);
}
}
if
(
!
m_mean_filter_output_old
||
(
m_mean_filter_output_old
->
numColors
!=
filter_input
->
numColors
))
{
if
(
!
m_mean_filter_output_old
||
(
m_mean_filter_output_old
->
numColors
!=
filter_input
->
numColors
))
{
delete
m_mean_filter_output_old
;
delete
[]
m_mean_filter_output_old
;
AllocColorPacket
(
m_mean_filter_output_old
,
filter_input
->
numColors
);
AllocColorPacket
(
m_mean_filter_output_old
,
filter_input
->
numColors
);
ZeroColorPacket
(
m_mean_filter_output_old
);
ZeroColorPacket
(
m_mean_filter_output_old
);
}
}
if
(
!
m_mean_values
||
(
m_mean_values
->
numColors
!=
filter_input
->
numColors
))
{
if
(
!
m_mean_values
||
(
m_mean_values
->
numColors
!=
filter_input
->
numColors
))
{
delete
m_mean_values
;
delete
[]
m_mean_values
;
AllocColorPacket
(
m_mean_values
,
filter_input
->
numColors
);
AllocColorPacket
(
m_mean_values
,
filter_input
->
numColors
);
ZeroColorPacket
(
m_mean_values
);
ZeroColorPacket
(
m_mean_values
);
}
}
if
(
!
m_mean_sums
||
(
m_mean_sums
->
numColors
!=
filter_input
->
numColors
))
{
if
(
!
m_mean_sums
||
(
m_mean_sums
->
numColors
!=
filter_input
->
numColors
))
{
delete
m_mean_sums
;
delete
[]
m_mean_sums
;
AllocLongColorPacket
(
m_mean_sums
,
filter_input
->
numColors
);
AllocLongColorPacket
(
m_mean_sums
,
filter_input
->
numColors
);
ZeroLongColorPacket
(
m_mean_sums
);
ZeroLongColorPacket
(
m_mean_sums
);
}
}
...
@@ -248,7 +248,7 @@ pColorPacket CAtmoOutputFilter::MeanFilter(pColorPacket filter_input, ATMO_BOOL
...
@@ -248,7 +248,7 @@ pColorPacket CAtmoOutputFilter::MeanFilter(pColorPacket filter_input, ATMO_BOOL
CopyColorPacket
(
filter_output
,
m_mean_filter_output_old
);
CopyColorPacket
(
filter_output
,
m_mean_filter_output_old
);
delete
(
char
*
)
filter_input
;
delete
[]
filter_input
;
return
(
filter_output
);
return
(
filter_output
);
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment