Merge branch 'texture2d-index-out-of-range' into 'master'

Fix index out of range in Texture2D See merge request vtk/vtk-m!2954
Merge branch 'release' into master
2024-10-05 01:49:02 +00:00 · 2024-06-26 20:48:37 -04:00 · 2024-06-26 17:46:45 -04:00 · 2024-06-26 17:46:45 -04:00 · 2024-06-26 17:46:45 -04:00 · 2024-06-21 16:50:11 -04:00
4 changed files with 8 additions and 8 deletions
--- a/data/baseline/filter/contour-uniform-boundaries.png
+++ b/data/baseline/filter/contour-uniform-boundaries.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25d61b72591e1ecd66a70e1005cb31a5d37b0bba90bec42288dd41118801000e
-size 29986
+oid sha256:137439af2a14dfaab461b07e643fb45dc8e898690f21ca9514cc794dc4afd50a
+size 30144
--- a/data/baseline/filter/contour-uniform.png
+++ b/data/baseline/filter/contour-uniform.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:558028eae0ddb162a3c437b7d12c30857f7b964b3dc9bda601e9750db0813fe5
-size 31393
+oid sha256:c62a7084613dddda80f2fb1c869f5adaef9efe50d6762b92b61aebd9692afcd4
+size 31812
--- a/data/baseline/filter/contour-wedge.png
+++ b/data/baseline/filter/contour-wedge.png
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a879c39ef99c13722da91b7178e41a70ac0aaa5735e7cd201899639464f2f151
-size 35281
+oid sha256:bfca08fc98539bb4241c44b47352e95c5b32e7126545d215291d0e51280709c3
+size 35099
--- a/vtkm/rendering/Texture2D.h
+++ b/vtkm/rendering/Texture2D.h
@ -145,8 +145,8 @@ public:
    VTKM_EXEC
    inline ColorType GetLinearFilteredColor(vtkm::Float32 u, vtkm::Float32 v) const
    {
-      u = u * static_cast<vtkm::Float32>(Width) - 0.5f;
-      v = v * static_cast<vtkm::Float32>(Height) - 0.5f;
+      u = u * static_cast<vtkm::Float32>(Width - 1);
+      v = v * static_cast<vtkm::Float32>(Height - 1);
      vtkm::Id x = static_cast<vtkm::Id>(vtkm::Floor(u));
      vtkm::Id y = static_cast<vtkm::Id>(vtkm::Floor(v));
      vtkm::Float32 uRatio = u - static_cast<vtkm::Float32>(x);
Author	SHA1	Message	Date
Manish Mathai	4e2cf5de28	Merge branch 'texture2d-index-out-of-range' into 'master' Fix index out of range in Texture2D See merge request vtk/vtk-m!2954	2024-06-26 20:48:37 -04:00
Vicente Bolea	726bd0b551	Merge branch 'release' into master	2024-06-26 17:46:45 -04:00
Vicente Bolea	743a7c3ac4	Merge branch 'release-2.0' into release	2024-06-26 17:46:45 -04:00
Vicente Bolea	b6a0e4d79b	Merge topic 'backport-3233' into release-2.0 638d18356 fix: perftest upload 1078d7dfb Revert "ci: fix perftest uploading" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kenneth Moreland <morelandkd@ornl.gov> Merge-request: !3235	2024-06-26 17:46:45 -04:00
Vicente Adolfo Bolea Sanchez	638d183567	fix: perftest upload (cherry picked from commit 76ddf7a5b2836cf4153e36f28dd2675f5ef8a735)	2024-06-21 16:50:11 -04:00
Vicente Adolfo Bolea Sanchez	1078d7dfb4	Revert "ci: fix perftest uploading" This reverts commit 31b8b2faf90a79e069761b12deac8525cd4c0aa1. (cherry picked from commit cdd3a55f61850c4438a0b0f890bc6e3f11c641fb)	2024-06-21 16:50:07 -04:00
Manish Mathai	fecea93da4	Update render unit test baseline images	2023-01-02 12:28:36 +05:30
Manish Mathai	3f2ca46626	Fix index out of range in Texture2D When `Texture2DSamplerExecutionObject<>::GetColor()` is called with u or v as 0, when running with linear filter mode, it can go out of index and try to access data at location before the texture data array. This fixes that issue.	2023-01-02 12:05:32 +05:30