RDF 1.1.1

Author: Matthäus G. Chajdas

README.md

@@ -30,10 +30,10 @@ The `amdrdf` library provides the following forwards/backwards compatibility gua
 
 Use `RDF_INTERFACE_VERSION` and `RDF_MAKE_VERSION` to check for the library version.
 
-## Changelog
+Patch releases (for example, `1.1.1`) will be bumped for bug fixes and other improvements.
 
-Interface-level changes only:
+## Changelog
 
 * **1.0**: Initial release
 * **1.1**: Improve naming consistency: Add `rdfStreamFromUserStream`, mark `rdfStreamCreateFromUserStream` as deprecated
-  
+* **1.1.1**: Fix `rdfChunkFileContainsChunk` returning `rdfResultError` when a chunk was not found instead of `rdfResultOk`  

rdf/inc/amdrdf.h

@@ -20,11 +20,12 @@
 
 #define RDF_IDENTIFIER_SIZE 16
 
-#define RDF_MAKE_VERSION(major, minor) \
+#define RDF_MAKE_VERSION(major, minor, patch) \
     ((static_cast<std::uint32_t>(major) << 22) | \
-     (static_cast<std::uint32_t>(minor) << 12))
+     (static_cast<std::uint32_t>(minor) << 12) | \
+     (static_cast<std::uint32_t>(patch)))
 
-#define RDF_INTERFACE_VERSION RDF_MAKE_VERSION(1, 1)
+#define RDF_INTERFACE_VERSION RDF_MAKE_VERSION(1, 1, 1)
 
 extern "C" {
 struct rdfChunkFile;

rdf/src/amdrdf.cpp

@@ -332,11 +332,11 @@ namespace internal
 
             auto it = chunkTypeRange_.find(id);
             if (it == chunkTypeRange_.end()) {
-                throw std::runtime_error("Chunk not found");
+                return false;
             }
 
             if (chunkIndex >= (it->second.last - it->second.first)) {
-                throw std::runtime_error("Chunk index out of range");
+                return false;
             }
 
             return true;

rdf/test/src/IO_test.cpp

@@ -93,6 +93,12 @@ TEST_CASE("rdf::LoadKnownGoodFile", "[rdf]")
     CHECK(cf.ContainsChunk("chunk1"));
     CHECK(cf.ContainsChunk("chunk2"));
 
+    CHECK(cf.ContainsChunk("chunk0", 0));
+    CHECK(cf.ContainsChunk("chunk0", 1));
+    CHECK(!cf.ContainsChunk("chunk0", 2));
+
+    CHECK(!cf.ContainsChunk("chunk3"));
+
     cf.ReadChunkData("chunk0", 0, [](size_t size, const void* data) -> void {
         CHECK(std::string(
             static_cast<const char*>(data),