]> git.sesse.net Git - casparcg/commitdiff
Fixed some issues detected by clang static analysis, also created bat file that launc...
authorHelge Norberg <helge.norberg@svt.se>
Wed, 25 Sep 2013 17:52:49 +0000 (19:52 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Wed, 25 Sep 2013 17:52:49 +0000 (19:52 +0200)
14 files changed:
.gitignore
accelerator/ogl/image/image_mixer.cpp
clang-analyze-to_file.bat [new file with mode: 0644]
clang-analyze.bat [new file with mode: 0644]
common/polling_filesystem_monitor.cpp
common/reactive.h
common/tweener.cpp
core/frame/frame.cpp
core/frame/geometry.cpp
core/frame/geometry.h
core/mixer/audio/audio_mixer.h
core/monitor/monitor.h
core/producer/color/color_producer.h
core/producer/scene/expression_parser.cpp

index e83b4c39f5c8416c983fe8aad8eaf14bfa1e1039..0cd4567b8c36b8ec6a2a2b66196d0da3df9ded5a 100644 (file)
@@ -116,3 +116,4 @@ freetype
 tmp
 bin
 x64
+/clang-analyze.out
index a6120ee674c8269d2ffeb42451cb2eb9e5590d99..5b1293ff0346a6b4efa7ebfdaf2b5807fa2f250b 100644 (file)
@@ -281,7 +281,7 @@ private:
                draw_params.transform                   = core::image_transform();
                draw_params.blend_mode                  = blend_mode;
                draw_params.background                  = target_texture;
-               draw_params.geometry                    = core::frame_geometry::default();
+               draw_params.geometry                    = core::frame_geometry::get_default();
 
                kernel_.draw(std::move(draw_params));
        }
diff --git a/clang-analyze-to_file.bat b/clang-analyze-to_file.bat
new file mode 100644 (file)
index 0000000..36ccb4c
--- /dev/null
@@ -0,0 +1,3 @@
+%echo off
+
+clang-analyze > clang-analyze.out 2>&1
\ No newline at end of file
diff --git a/clang-analyze.bat b/clang-analyze.bat
new file mode 100644 (file)
index 0000000..cf8443c
--- /dev/null
@@ -0,0 +1,3 @@
+%echo off
+
+for /f %%f in ('dir /s /b *.cpp') do clang  --analyze  -x c++ -I "dependencies64/asmlib/" -I "dependencies64/bluefish/include" -I "dependencies64/boost/" -I "dependencies64/ffmpeg/include/" -I "dependencies64/freeimage/include/" -I "dependencies64/freetype/include/" -I "dependencies64/media_sdk/include/" -I "dependencies64/openal/include/" -I "dependencies64/glew/include" -I "dependencies64/sfml/include/" -I "dependencies64/tbb/include/" -I "." -I "dependencies64/gtest/include" -isystem  "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include" -isystem  "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\atlmfc\include" -isystem  "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\include" -include "common/compiler/vs/disable_silly_warnings.h" -DTBB_USE_CAPTURED_EXCEPTION=0 -DNDEBUG -DCOMPILE_RELEASE -D_MT -D_DLL  -fmsc-version=1600  -fms-extensions  -fms-compatibility  -fdiagnostics-format=msvc %%f
\ No newline at end of file
index 95e7c97277b9aa94338106ef9e12800a2a443803..9737d6672818aa953022540bbd393734b6b82082 100644 (file)
@@ -26,6 +26,7 @@
 #include <map>
 #include <set>
 #include <iostream>
+#include <cstdint>
 
 #include <boost/thread.hpp>
 #include <boost/foreach.hpp>
index d9140f6cae8167e24a0e289fc890f2d588249871..c4f6930335d740eb5113b73ae54a7a3cf6468974 100644 (file)
@@ -306,7 +306,7 @@ public:
        {
        }
                
-       basic_subject(subject&& other)
+       basic_subject(basic_subject&& other)
                : impl_(std::move(other.impl_))
        {
        }
index bf9e2b450328a6381b9b748d1a414c59e9ca18bc..87462391dd5f8a73d3f125d1e3ff1f08c111eb98 100644 (file)
@@ -53,6 +53,7 @@
 #include <string>
 #include <locale>
 #include <functional>
+#include <algorithm>
 #include <vector>
 
 namespace caspar { namespace core {
index 9a17f7cc3c7940f9fbe9664b9c28e4b2f337dae5..ba7cdbcdc4afc4c2ead0b3eaab05a79581b8bb3b 100644 (file)
@@ -48,7 +48,7 @@ struct mutable_frame::impl : boost::noncopyable
                , audio_data_(std::move(audio_buffer))
                , desc_(desc)
                , tag_(tag)
-               , geometry_(frame_geometry::default())
+               , geometry_(frame_geometry::get_default())
        {
                BOOST_FOREACH(auto& buffer, buffers_)
                        if(!buffer.data())
@@ -98,7 +98,7 @@ struct const_frame::impl : boost::noncopyable
                : desc_(core::pixel_format::invalid)
                , tag_(tag)     
                , id_(0)
-               , geometry_(frame_geometry::default())
+               , geometry_(frame_geometry::get_default())
        {
        }
        
@@ -107,7 +107,7 @@ struct const_frame::impl : boost::noncopyable
                , desc_(desc)
                , tag_(tag)
                , id_(reinterpret_cast<int>(this))
-               , geometry_(frame_geometry::default())
+               , geometry_(frame_geometry::get_default())
        {
                if(desc.format != core::pixel_format::bgra)
                        CASPAR_THROW_EXCEPTION(not_implemented());
index f99c909d69f7ae813bcaa0f7bf483c1023b43950..c547f981d32b93376a928cb8d0753b24e6fc606d 100644 (file)
@@ -44,7 +44,7 @@ const frame_geometry& frame_geometry::operator=(const frame_geometry& rhs) { imp
 frame_geometry::geometry_type frame_geometry::type() { return impl_->type_; }
 const std::vector<float>& frame_geometry::data() { return impl_->data_; }
        
-const frame_geometry& frame_geometry::default()
+const frame_geometry& frame_geometry::get_default()
 {
        const float d[] = {0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f};
        static frame_geometry g(frame_geometry::quad, std::move(std::vector<float>(d, d+8)));
index eaecce084faa9827604f561c6b96eacca9b9b366..ceb3a9b7ad39ce99ffddba7af1db452e635ba19b 100644 (file)
@@ -44,7 +44,7 @@ public:
        geometry_type type();
        const std::vector<float>& data();
        
-       static const frame_geometry& default();
+       static const frame_geometry& get_default();
 
 private:
        struct impl;
index ceb40136d7e3cc78fb2916f341d11e2e745d1c12..85dab7944d150ddfb57e37a26f8da9eb9ce3079e 100644 (file)
@@ -29,6 +29,7 @@
 #include <tbb/cache_aligned_allocator.h>
 
 #include <vector>
+#include <cstdint>
 
 FORWARD2(caspar, diagnostics, class graph);
 
index 447ee352a342a8ea67dc7e00716e939bb677c4fd..1e9c04dfadd55236c771ccb8be6e7adf88152caa 100644 (file)
@@ -8,6 +8,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
+#include <cstdint>
 
 #include <boost/variant.hpp>
 #include <boost/lexical_cast.hpp>
index 25c08e597282dab77d0c5ca202d81071d8f58966..2a998cf54f57986678f8e8cb9c60fe91b03a2056 100644 (file)
@@ -25,6 +25,7 @@
 
 #include <string>
 #include <vector>
+#include <cstdint>
 
 namespace caspar { namespace core {
 
index 2735c424cb535550540e625ee392461489a0c154..532c63af9d6b73ec1fe3fd3d52b1f59cd03a42b1 100644 (file)
@@ -28,6 +28,7 @@
 #include <vector>
 #include <functional>
 #include <typeinfo>
+#include <cstdint>
 
 #include <boost/any.hpp>