From 371e05574beee3ec5846db5b6a10c6acfa923d82 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 27 Nov 2019 15:55:41 +0700
Subject: [PATCH] fix pvs warning

---
 scripts/pvs_analyze.sh                        |  2 +
 .../render_system_drawer.cpp                  | 98 ++++++++++---------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/scripts/pvs_analyze.sh b/scripts/pvs_analyze.sh
index 501d2e5c..f7b1381a 100755
--- a/scripts/pvs_analyze.sh
+++ b/scripts/pvs_analyze.sh
@@ -6,8 +6,10 @@ cd $BUILD_DIR/pvs_analyze
 rm -rf pvs_report
 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=On ../..
 pvs-studio-analyzer analyze\
+                    --disableLicenseExpirationCheck\
                     -e ../../untests\
                     -e ../../modules\
+                    -e ../../headers/3rdparty\
                     -e ../../sources/3rdparty\
                     -o pvs_report.log\
                     -j8
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 6a4d84c7..838a51bf 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -273,66 +273,74 @@ namespace e2d::render_system_impl
 
             texture_ptr tex_p;
             const texture_asset* texture_asset_ptr = atlas_page
-                ? static_cast<texture_asset*>(atlas_page->rendererObject)
+                ? static_cast<const texture_asset*>(atlas_page->rendererObject)
                 : nullptr;
             if ( texture_asset_ptr ) {
                 tex_p = texture_asset_ptr->content();
             }
 
             render::sampler_min_filter tex_min_f = render::sampler_min_filter::linear;
-            switch ( atlas_page->minFilter ) {
-            case SP_ATLAS_NEAREST:
-            case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
-            case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
-                tex_min_f = render::sampler_min_filter::nearest;
-                break;
-            default:
-                tex_min_f = render::sampler_min_filter::linear;
-                break;
+            if ( atlas_page ) {
+                switch ( atlas_page->minFilter ) {
+                case SP_ATLAS_NEAREST:
+                case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
+                case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
+                    tex_min_f = render::sampler_min_filter::nearest;
+                    break;
+                default:
+                    tex_min_f = render::sampler_min_filter::linear;
+                    break;
+                }
             }
 
             render::sampler_mag_filter tex_mag_f = render::sampler_mag_filter::linear;
-            switch ( atlas_page->magFilter ) {
-            case SP_ATLAS_NEAREST:
-            case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
-            case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
-                tex_mag_f = render::sampler_mag_filter::nearest;
-                break;
-            default:
-                tex_mag_f = render::sampler_mag_filter::linear;
-                break;
+            if ( atlas_page ) {
+                switch ( atlas_page->magFilter ) {
+                case SP_ATLAS_NEAREST:
+                case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
+                case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
+                    tex_mag_f = render::sampler_mag_filter::nearest;
+                    break;
+                default:
+                    tex_mag_f = render::sampler_mag_filter::linear;
+                    break;
+                }
             }
 
             render::sampler_wrap tex_wrap_s = render::sampler_wrap::repeat;
-            switch ( atlas_page->uWrap ) {
-            case SP_ATLAS_MIRROREDREPEAT:
-                tex_wrap_s = render::sampler_wrap::mirror;
-                break;
-            case SP_ATLAS_CLAMPTOEDGE:
-                tex_wrap_s = render::sampler_wrap::clamp;
-                break;
-            case SP_ATLAS_REPEAT:
-                tex_wrap_s = render::sampler_wrap::repeat;
-                break;
-            default:
-                E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
-                break;
+            if ( atlas_page ) {
+                switch ( atlas_page->uWrap ) {
+                case SP_ATLAS_MIRROREDREPEAT:
+                    tex_wrap_s = render::sampler_wrap::mirror;
+                    break;
+                case SP_ATLAS_CLAMPTOEDGE:
+                    tex_wrap_s = render::sampler_wrap::clamp;
+                    break;
+                case SP_ATLAS_REPEAT:
+                    tex_wrap_s = render::sampler_wrap::repeat;
+                    break;
+                default:
+                    E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
+                    break;
+                }
             }
 
             render::sampler_wrap tex_wrap_t = render::sampler_wrap::repeat;
-            switch ( atlas_page->vWrap ) {
-            case SP_ATLAS_MIRROREDREPEAT:
-                tex_wrap_t = render::sampler_wrap::mirror;
-                break;
-            case SP_ATLAS_CLAMPTOEDGE:
-                tex_wrap_t = render::sampler_wrap::clamp;
-                break;
-            case SP_ATLAS_REPEAT:
-                tex_wrap_t = render::sampler_wrap::repeat;
-                break;
-            default:
-                E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
-                break;
+            if ( atlas_page ) {
+                switch ( atlas_page->vWrap ) {
+                case SP_ATLAS_MIRROREDREPEAT:
+                    tex_wrap_t = render::sampler_wrap::mirror;
+                    break;
+                case SP_ATLAS_CLAMPTOEDGE:
+                    tex_wrap_t = render::sampler_wrap::clamp;
+                    break;
+                case SP_ATLAS_REPEAT:
+                    tex_wrap_t = render::sampler_wrap::repeat;
+                    break;
+                default:
+                    E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
+                    break;
+                }
             }
 
             material_asset::ptr mat_a;